summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-02-27 00:20:17 +0100
committermaximilian attems <maks@debian.org>2006-02-27 00:20:17 +0100
commit830fd3fa51658cf0398cbb037a8485439ae4ce2d (patch)
tree7f074e4f4d39f782def3c1ea14106339a16f3ff2 /init
parenta563d25cc42346ba18a43c2a37896316c245d922 (diff)
downloadinitramfs-tools-830fd3fa51658cf0398cbb037a8485439ae4ce2d.tar.gz
initramfs-tools-830fd3fa51658cf0398cbb037a8485439ae4ce2d.zip
sync with ubuntu22 + some handmerges
Diffstat (limited to 'init')
-rwxr-xr-xinit12
1 files changed, 10 insertions, 2 deletions
diff --git a/init b/init
index 61a8379..f4ec157 100755
--- a/init
+++ b/init
@@ -41,6 +41,14 @@ for x in $(cat /proc/cmdline); do
;;
root=*)
ROOT=${x#root=}
+ case $ROOT in
+ LABEL=*)
+ ROOT="/dev/disk/by-label/${ROOT#LABEL=}"
+ ;;
+ UUID=*)
+ ROOT="/dev/disk/by-uuid/${ROOT#UUID=}"
+ ;;
+ esac
;;
nfsroot=*)
NFSROOT=${x#nfsroot=}
@@ -84,7 +92,7 @@ run_scripts /scripts/init-top
parse_numeric ${ROOT}
maybe_break modules
-log_begin_msg "Loading modules"
+log_begin_msg "Loading essential drivers..."
load_modules
log_end_msg
@@ -94,7 +102,7 @@ run_scripts /scripts/init-premount
log_end_msg
maybe_break mount
-log_begin_msg "Mounting root file system"
+log_begin_msg "Mounting root file system..."
mountroot
log_end_msg