From e6d536e1b9c91a167eb79f288a17496712a330f2 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Mon, 19 Jan 2015 18:30:05 +0100 Subject: simplified --- bin/busybox | Bin 2057504 -> 2304000 bytes bin/ifup | 7 ------- bin/resume | Bin 1317856 -> 0 bytes bin/sh | 1 - bin/udhcpc.script | 47 ----------------------------------------------- bin/vgchange | 1 - dev/vc/0 | 1 - etc/mtab | 1 - etc/resolv.conf | 1 - etc/suspend.conf | 10 ---------- init | 6 ++++-- make | 4 ++++ 12 files changed, 8 insertions(+), 71 deletions(-) delete mode 100755 bin/ifup delete mode 100755 bin/resume delete mode 120000 bin/sh delete mode 100755 bin/udhcpc.script delete mode 120000 bin/vgchange delete mode 120000 dev/vc/0 delete mode 100644 etc/mtab delete mode 100644 etc/resolv.conf delete mode 100644 etc/suspend.conf create mode 100755 make diff --git a/bin/busybox b/bin/busybox index 3d56a2d..8919e12 100755 Binary files a/bin/busybox and b/bin/busybox differ diff --git a/bin/ifup b/bin/ifup deleted file mode 100755 index 2b60f1c..0000000 --- a/bin/ifup +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -DEV=$1 - -ifconfig $DEV up -udhcpc -t 5 -q -s /bin/udhcpc.script - diff --git a/bin/resume b/bin/resume deleted file mode 100755 index 977924b..0000000 Binary files a/bin/resume and /dev/null differ diff --git a/bin/sh b/bin/sh deleted file mode 120000 index c3fa810..0000000 --- a/bin/sh +++ /dev/null @@ -1 +0,0 @@ -busybox \ No newline at end of file diff --git a/bin/udhcpc.script b/bin/udhcpc.script deleted file mode 100755 index 40ee738..0000000 --- a/bin/udhcpc.script +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# udhcpc script edited by Tim Riker - -RESOLV_CONF="/etc/resolv.conf" - -[ -n "$1" ] || { echo "Error: should be called from udhcpc"; exit 1; } - -NETMASK="" -[ -n "$subnet" ] && NETMASK="netmask $subnet" -BROADCAST="broadcast +" -[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" - -case "$1" in - deconfig) - echo "Setting IP address 0.0.0.0 on $interface" - ifconfig $interface 0.0.0.0 - ;; - - renew|bound) - echo "Setting IP address $ip on $interface" - ifconfig $interface $ip $NETMASK $BROADCAST - - if [ -n "$router" ] ; then - echo "Deleting routers" - while route del default gw 0.0.0.0 dev $interface ; do - : - done - - metric=0 - for i in $router ; do - echo "Adding router $i" - route add default gw $i dev $interface metric $((metric++)) - done - fi - - echo "Recreating $RESOLV_CONF" - echo -n > $RESOLV_CONF-$$ - [ -n "$domain" ] && echo "search $domain" >> $RESOLV_CONF-$$ - for i in $dns ; do - echo " Adding DNS server $i" - echo "nameserver $i" >> $RESOLV_CONF-$$ - done - mv $RESOLV_CONF-$$ $RESOLV_CONF - ;; -esac - -exit 0 diff --git a/bin/vgchange b/bin/vgchange deleted file mode 120000 index 9428656..0000000 --- a/bin/vgchange +++ /dev/null @@ -1 +0,0 @@ -lvm \ No newline at end of file diff --git a/dev/vc/0 b/dev/vc/0 deleted file mode 120000 index bea71cc..0000000 --- a/dev/vc/0 +++ /dev/null @@ -1 +0,0 @@ -../console \ No newline at end of file diff --git a/etc/mtab b/etc/mtab deleted file mode 100644 index 17d1d6f..0000000 --- a/etc/mtab +++ /dev/null @@ -1 +0,0 @@ -none /dev devtmpfs 0 0 diff --git a/etc/resolv.conf b/etc/resolv.conf deleted file mode 100644 index cae093a..0000000 --- a/etc/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -nameserver 8.8.8.8 diff --git a/etc/suspend.conf b/etc/suspend.conf deleted file mode 100644 index 1cc26ad..0000000 --- a/etc/suspend.conf +++ /dev/null @@ -1,10 +0,0 @@ -snapshot device = /dev/snapshot -resume device = /dev/disk/by-label/rootfs -resume offset = 0 # value=`swap-offset /swapfile` -#image size = 350000000 -#suspend loglevel = 2 -compute checksum = y -compress = y -#encrypt = y -#early writeout = y -#splash = y diff --git a/init b/init index b868088..2b660c8 100755 --- a/init +++ b/init @@ -41,9 +41,12 @@ cryptsetup_do() mount_root() { echo "mount root $1" - mount -o ro $1 /newroot + mount $1 /newroot } +# setup directories +mkdir -p /dev /proc /sys /newroot + # Mount the /dev, /proc and /sys filesystems. mount -t devtmpfs none /dev mount -t proc none /proc @@ -52,7 +55,6 @@ mount -t sysfs none /sys # Do your stuff here. prep_dev cryptsetup_do $HOME home -#resume mount_root $ROOT || rescue_shell # Clean up. diff --git a/make b/make new file mode 100755 index 0000000..7e6d7cc --- /dev/null +++ b/make @@ -0,0 +1,4 @@ +#!/bin/zsh -x + +find . \( ! -regex '.*/\..*' \) -print0 | sed "s|\./make||" | cpio --null -ov --format=newc | gzip -9 > /tmp/initramfs.cpio.gz + -- cgit v1.2.3