Changeset 880 for trunk


Ignore:
Timestamp:
Dec 24, 2016, 3:58:07 PM (3 years ago)
Author:
amain
Message:

rootfs: several minor fixes

Location:
trunk
Files:
2 added
5 deleted
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/debian/rootfs/debian.mk

    r873 r880  
    110110
    111111debian/rootfs/files-install: debian/rootfs/bootstrap
    112         if [ ! -f $(ROOTFS_BUILD_DIR)/etc/init.d/rcS.debian -a -e $(ROOTFS_BUILD_DIR)/etc/init.d/rcS ]; then \
    113                 sudo mv -v $(ROOTFS_BUILD_DIR)/etc/init.d/rcS $(ROOTFS_BUILD_DIR)/etc/init.d/rcS.debian; \
    114         fi
    115112        if [ ! -p $(ROOTFS_BUILD_DIR)/dev/initctl ]; then  \
    116113                sudo mkdir -p $(ROOTFS_BUILD_DIR)/dev;         \
     
    182179debian/rootfs/post-setup: debian/rootfs/bootstrap
    183180        sudo mkdir -p $(ROOTFS_BUILD_DIR)/etc/apt
    184         sudo bash -c "echo -e \"# For low memory (<64M) system, which have a hard time running apt-get update,\n# DebWrt provides a Debian mirror containing a, still very large, subset (~13.000) of all\n# Debian packages.\ndeb http://debian.debwrt.net/ $(ROOTFS_DEBIAN_RELEASE) main\" > $(ROOTFS_BUILD_DIR)/etc/apt/sources.list"
     181        sudo bash -c "echo -e \"# For low memory (<64M) system, which have a hard time running apt-get update,\n# DebWrt provides a Debian mirror containing a, still very large, subset (~13.000) of all\n# Debian packages.\ndeb http://debian.debwrt.net/debian $(ROOTFS_DEBIAN_RELEASE) main\" > $(ROOTFS_BUILD_DIR)/etc/apt/sources.list"
    185182        sudo bash -c "echo \"deb http://packages.debwrt.net/debwrt $(ROOTFS_DEBIAN_RELEASE)-debwrt-stable main\" >> $(ROOTFS_BUILD_DIR)/etc/apt/sources.list"
    186183        sudo bash -c "echo \"$(DEBWRTVERSION)\" >$(ROOTFS_BUILD_DIR)/etc/debwrt_version"
     
    199196        @echo "I: Qemu 2nd stage install disabled. Second stage needs now to be performend on the target device itself."
    200197        @echo "I: Qemu 2nd stage install can be enabled using menuconfig (ROOTFS_DEBIAN_QEMU_2ND_STAGE)."
     198        @# Firstboot only works on sysvinit systems, not on newer systemd
     199        sudo mv $(ROOTFS_BUILD_DIR)/etc/init.d/rcS $(ROOTFS_BUILD_DIR)/etc/init.d/rcS.Debian
     200        sudo ln -s /etc/init.d/rcS.firstboot $(ROOTFS_BUILD_DIR)/etc/init.d/rcS
     201
    201202endif
    202203        touch $@
    203204
    204 debian/rootfs/clean:
     205debian/rootfs/clean: debian/rootfs/debwrt-packages-clean
    205206        sudo rm -rf $(ROOTFS_BUILD_DIR)
    206207        rm -f debian/rootfs/bootstrap
  • trunk/debian/rootfs/files/all/etc/hosts

    r245 r880  
    11127.0.0.1       localhost.local localhost
    22192.168.1.1     debwrt.lan      debwrt
    3 192.168.1.2     hq.lan hq # Head Quarters, your development host
  • trunk/debian/rootfs/files/all/etc/init.d/debwrt

    • Property svn:executable set to *
  • trunk/debian/rootfs/files/all/etc/init.d/rcS.firstboot

    r301 r880  
    1 #! /bin/sh
    2 
    3 ### BEGIN INIT INFO
    4 # Provides:             rcS
    5 # Required-Start:       
    6 # Required-Stop:       
    7 # Default-Start:       
    8 # Default-Stop:         
    9 # Short-Description:    first boot run control start for Debwrt
    10 ### END INIT INFO
     1#!/bin/sh
    112
    123# Mount root read-write
  • trunk/debian/rootfs/files/all/usr/sbin/PostInstall

    r868 r880  
    1414  echo "I: Running second stage of debootstap (may take some time)"
    1515  /debootstrap/debootstrap --second-stage
     16else
     17  echo "I: No debootstrap executable found, assuming 'second stage debootstrap' is already done"
     18fi
    1619
    17   echo "I: Cleaning up /var/cache/apt/archives"
    18   rm -rf /var/cache/apt/archives
    19   mkdir -p /var/cache/apt/archives/partial
    20 else
    21   echo "W: No debootstrap executable found, assuming 'second stage debootstrap' is allready done"
    22 fi
     20echo "I: Cleaning up /var/cache/apt/archives"
     21rm -rf /var/cache/apt/archives
     22mkdir -p /var/cache/apt/archives/partial
    2323
    2424# hack for Debian sid
    2525[ -e /tmp/sshd -a ! -e /var/run/sshd ] && mv /tmp/sshd /var/run
    2626
    27 if [ -f /etc/init.d/rcS ] ; then
    28   # the symbolic link to /etc/init.d/rcS.firstboot is gone
    29   if ! diff -q /etc/init.d/rcS /etc/init.d/rcS.debian; then
    30     # they are equal
    31     rm /etc/init.d/rcS.debian
    32   fi
    33 fi
     27# disable systemd services
     28echo "I: Disabling services"
     29find /etc/systemd -name "inetd.service"   -delete
     30find /etc/systemd -name "dnsmasq.service" -delete
    3431
    35 if [ $(find /lib/modules/ -maxdepth 1 -mindepth 1 -type d | wc -l) -lt 1 ]
    36 then
    37   cat << HERE
    38 
    39 W: No kernel modules directory found in /lib/modules.
    40    See /lib/modules/debwrt.README for more information.
    41 
    42 HERE
    43 fi
    44 
    45 if [ -x /usr/sbin/in.telnetd ] ; then
    46   echo "W: telnet daemon programm found, consider uninstalling it."
    47   echo
    48 fi
    49 
    50 # note: This program did NOT check NOR setup network switch configuration
     32echo "I: Setting root password"
     33sed -i 's!^root:.*!root:$1$Rm/q9RCm$khpJ819vFteZqYNdf60wb1:14254:0:99999:7:::!' /etc/shadow
    5134
    5235echo -n "I: syncing disks...."
  • trunk/debian/rootfs/include_packages.list

    r875 r880  
    4444tmux
    4545iw
    46 vim
     46dnsutils
  • trunk/debian/rootfs/packages.mk

    r868 r880  
    106106endif
    107107
     108debian/rootfs/debwrt-packages-clean:
     109        rm -f $(TMP_DIR)/Packages
     110        rm -f $(TMP_DIR)/packages
     111        rm -f $(TMP_DIR)/depends.stage1
     112        rm -f $(TMP_DIR)/depends.final
     113        rm -f $(TMP_DIR)/replaces
     114        rm -f $(TMP_DIR)/install
     115        rm -f $(TMP_DIR)/install.files
     116        rm -f debian/rootfs/download-debwrt-packages-lists
     117        rm -f debian/rootfs/prepare-debwrt-packages
     118        rm -f debian/rootfs/copy-debwrt-packages
     119        rm -f debian/rootfs/install-debwrt-packages
  • trunk/qemu/qemu.mk

    r879 r880  
    4747            echo "be      : big endian Malta"; \
    4848            echo "le      : little endian Malta (default)"; \
    49             echo "current : use rootfs/kernel from build/ dir [TODO]"; \
     49            echo "current : use rootfs/kernel from build/ dir [TODO:kernel]"; \
    5050            echo "drelease: download/use latest <drelease> snapshot rootfs"; \
    5151            echo "          (sid|stretch|jessie(default)|wheezy)"; \
     
    173173$(TMP_DIR)/qemu/$(_QSESSION)/image.bz2:
    174174        mkdir -p $(TMP_DIR)/qemu/$(_QSESSION)
    175         wget -qO $(TMP_DIR)/qemu/$(_QSESSION)/image.bz2 "http://downloads.debwrt.net/rootfs/snapshots/$(_QARCH)/$(_QROOTFS)/debwrt-rootfs-$(_QROOTFS)-$(_QARCH)-trunk.tar.bz2?direct=1"
     175        @if [ "current" = "$(_QROOTFS)" ]; \
     176        then \
     177            echo "Copy current image $(ROOTFS_TAR_BZ2)...."; \
     178            cp $(ROOTFS_INSTALL_DIR)/$(ROOTFS_TAR_BZ2) $(TMP_DIR)/qemu/$(_QSESSION)/image.bz2; \
     179        else \
     180            echo "Download image $(_QARCH)/$(_QROOTFS)...."; \
     181            wget -qO $(TMP_DIR)/qemu/$(_QSESSION)/image.bz2 "http://downloads.debwrt.net/rootfs/snapshots/$(_QARCH)/$(_QROOTFS)/debwrt-rootfs-$(_QROOTFS)-$(_QARCH)-trunk.tar.bz2?direct=1"; \
     182        fi
    176183
    177184$(TMP_DIR)/qemu/$(_QSESSION)/hda.img: | qemu/check $(TMP_DIR)/qemu/$(_QSESSION)/image.bz2 $(TMP_DIR)/qemu/$(_QSESSION)/modules.tar.gz /usr/bin/pv /sbin/kpartx
Note: See TracChangeset for help on using the changeset viewer.