diff options
| author | Mike Westerhof <mwester@dls.net> | 2008-08-22 04:39:50 +0000 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2008-08-22 04:39:50 +0000 |
| commit | 064d9f29930b20b45d0a68691b7bed49e1707aad (patch) | |
| tree | 67f9c15c49501f9afc43c701b049f0c9a10d7002 /packages/slugos-init/files | |
| parent | c367c54adc09d21456cef634f3460ebc15406c95 (diff) | |
slugOS 5.0 is born - initial commit.
- enable many busybox options
- replace several packages in rootfs with busybox, and adjust various
config files and scripts to accomodate busybox options
- change default alignment behavior to be more lenient
Note: this is the first of many disruptive changes for SlugOS 5; this
version is to be considered unstable at best!
Diffstat (limited to 'packages/slugos-init/files')
| -rw-r--r-- | packages/slugos-init/files/boot/disk | 1 | ||||
| -rw-r--r-- | packages/slugos-init/files/boot/kexec | 2 | ||||
| -rw-r--r-- | packages/slugos-init/files/sysconf | 2 | ||||
| -rw-r--r-- | packages/slugos-init/files/turnup | 10 |
4 files changed, 8 insertions, 7 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index a991bc50ac..d47be54c37 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -37,6 +37,7 @@ then # the UUID mount fails a standard device mount # is attempted. if test -n "$UUID" && + mount "$@" UUID="$UUID" /mnt || mount "$@" -U "$UUID" /mnt || mount "$@" "$device" /mnt then diff --git a/packages/slugos-init/files/boot/kexec b/packages/slugos-init/files/boot/kexec index 8973d20bfe..dd757fd771 100644 --- a/packages/slugos-init/files/boot/kexec +++ b/packages/slugos-init/files/boot/kexec @@ -126,7 +126,7 @@ if [ -n "$1" -a -n "$2" ] ; then sleep "$sleep" if [ -n "$UUID" ] ; then echo "mounting partition UUID \"$UUID\"..." - if mount -o ro -U "$UUID" /mnt ; then + if mount -o ro UUID="$UUID" /mnt ; then need_umount=1 kexec_image="/mnt/$kpath" fi diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf index 57a69b7643..3059a466da 100644 --- a/packages/slugos-init/files/sysconf +++ b/packages/slugos-init/files/sysconf @@ -238,7 +238,7 @@ sysconf_save_conffiles(){ } # ( cd "$ffsdir" - find etc/*.conf $(sed 's!^/!!' usr/lib/ipkg/info/*.conffiles) ! -type d -newer etc/.configured -print | + find etc/*.conf $(sed 's!^/!!' usr/lib/opkg/info/*.conffiles) ! -type d -newer etc/.configured -print | sed 's/^/diff /' exec sed 's/#.*$//;/^[ ]*$/d' etc/default/conffiles ) | sed 's!^/*!!' | diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index c6220077a5..4aa1fba3ed 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -49,7 +49,7 @@ l root root 1777 /var/tmp /var/volatile/tmp d root root 0755 /var/lock/subsys none d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none -d root root 0755 /var/lib/ipkg none +d root root 0755 /var/lib/opkg none f root root 0664 /var/log/wtmp none f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" @@ -68,7 +68,7 @@ d root root 1777 /var/tmp none d root root 0755 /var/lock/subsys none d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none -d root root 0755 /var/lib/ipkg none +d root root 0755 /var/lib/opkg none f root root 0664 /var/log/wtmp none f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" @@ -578,7 +578,7 @@ disk() { fso="$(fsoptions "$@")" if if test -n "$uuid" then - mount "$@" -U "$uuid" "$new" + mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new" else mount "$@" "$device" "$new" fi @@ -591,7 +591,7 @@ disk() { if test -n "$fst" && if test -n "$uuid" then - mount -t "$fst" -o "$fso" -U "$uuid" "$new" + mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new" else mount -t "$fst" -o "$fso" "$device" "$new" fi @@ -633,7 +633,7 @@ disk() { then echo " options used: -t $fst -o $fso [error in this script]" >&2 test -n "$uuid" && - echo " uuid: $uuid (passed with -U)" >&2 + echo " uuid: $uuid (passed with UUID= or -U)" >&2 fi fi |