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/boot | |
| 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/boot')
| -rw-r--r-- | packages/slugos-init/files/boot/disk | 1 | ||||
| -rw-r--r-- | packages/slugos-init/files/boot/kexec | 2 |
2 files changed, 2 insertions, 1 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 |