disapproval of revision '0b95bcbd94eecc35400e4a1a8af33317d5f8b411'

diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index 37505f8..ede33a3 100755 (executable)
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -13,9 +13,9 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 if test -n "$1"
 then
-       label="$1"
+       device="$1"
        shift
-       echo "boot: rootfs: mount $* $label"
+       echo "boot: rootfs: mount $* $device"
        #
        # wait if required
        test "$sleep" -gt 0 && sleep "$sleep"
@@ -23,7 +23,7 @@ then
        # Mount read-write because before exec'ing init
        # this script creates the '.recovery' link to
        # detect failed boot.  No file type is given to
-       if mount "$@" -L "$label" /mnt
+       if mount "$@" "$device" /mnt
        then
                # checkmount checks for sh, init and no
                # .recovery plus either mnt or initrd

diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 3bb1a55..0029697 100644 (file)
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -309,7 +309,7 @@ setup_fstab() {
 
 
 #
-# boot_rootfs <boot type> <flash file system> <sleep time> <label> <device> [options]
+# boot_rootfs <boot type> <flash file system> <sleep time> <device> [options]
 #  Change the flash partition (not the current root!) to boot off
 #  the new root file system
 boot_rootfs() {
@@ -318,9 +318,8 @@ boot_rootfs() {
        type="$1"
        ffs="$2"
        sleep="$3"
-       label="$4"
-       device="$5"
-       
+       device="$4"
+
        # test this first as the test does not depend on the correctness
        # of the other arguments
        test -n "$ffs" -a -d "$ffs" || {
@@ -377,7 +376,7 @@ boot_rootfs() {
                };;
        *)      {       echo '#!/bin/sh'
                        test "$sleep" -gt 0 && echo -n "sleep='$sleep' "
-                       echo -n "exec '/boot/$type' '$label'"
+                       echo -n "exec '/boot/$type' '$device'"
                        for opt in "$@"
                        do
                                echo -n " '$opt'"
@@ -493,10 +492,8 @@ disk() {
                # if everything went ok boot from this disk
                if test $status -eq 0
                then
-                       TEMP_LABEL=`date +%y%m%d%H%M`
-                       tune2fs -L $TEMP_LABEL $device
                        # memsticks boot like disks, so ignore the -m
-                       boot_rootfs disk "$ffs" "$sleep" "$TEMP_LABEL" "$device" -t "$fst" -o "$fso" 
+                       boot_rootfs disk "$ffs" "$sleep" "$device" -t "$fst" -o "$fso"
                fi
        else
                echo "turnup disk: $device($*): unable to mount device on $new" >&2

diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 21e1d9f..d22bdde 100644 (file)
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r48"
+PR = "r47"
 
 SRC_URI = "file://linuxrc \
           file://boot/flash \