Add LABEL/UUID support to yabootconfig

* ybin/yabootconfig: Add support for LABEL= and UUID= in
  /etc/fstab. (Colin Watson)
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-72

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index bd9a73ce4bb8732d665f45abdb28f70e4f5360f2..0ff1bfbf0c83b7bb1dc222b3599ccde53c890da4 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,120 +1,120 @@
-./0arch-timestamps0    1083998323      1084053888
-./BUGS 1082938563      1000991730
-./COPYING      1082938564      1000991730
-./ChangeLog    1084053787      1084053885
-./Config       1082938563      1002101497
-./INSTALL      1082938564      1000991730
-./Makefile     1082938564      1082247755
-./README       1082938564      1044766458
-./README.man.patch     1082938564      1000991730
-./THANKS       1082938564      1006350263
-./TODO 1082938564      1044766566
-./changelog    1082938564      1082248025
-./doc/Makefile 1082938567      1019310768
-./doc/README.ofboot    1082938564      1000991730
-./doc/README.ofpath    1082938564      1000991730
-./doc/README.rs6000    1082938564      1007200689
-./doc/examples/README.dualboot.chrp    1082938564      1000991730
-./doc/examples/README.mbicons  1082938564      1000991730
-./doc/examples/README.simpleboot.chrp  1082938564      1000991730
-./doc/examples/dualboot.chrp   1082938564      1068017741
-./doc/examples/large-penguin.mbicon    1082938564      1000991730
-./doc/examples/simpleboot.chrp 1082938564      1068017750
-./doc/examples/yaboot.conf.multi-boot  1082938564      1006348765
-./doc/examples/yaboot.conf.rs6000      1082938564      1006348765
-./doc/examples 1084053888      1068017750
-./doc/yaboot-howto.de.sgml     1082938567      1077455488
-./doc/yaboot-howto.sgml        1082938567      1077455511
-./doc  1084053888      1081830064
-./etc/yaboot.conf      1082938564      1006348765
-./etc  1084053888      1007269243
-./first/ofboot 1083998120      1065311880
-./first        1084053888      1071492158
-./include/asm/elf.h    1082938564      1000991730
-./include/asm/ppc_asm.tmpl     1082938564      1000991730
-./include/asm/processor.h      1082938564      1000991730
-./include/asm  1084053888      1007269243
-./include/bootinfo.h   1082938564      1007200690
-./include/byteorder.h  1082938564      1000991730
-./include/cfg.h        1082938564      1007200690
-./include/cmdline.h    1082938564      1007200690
-./include/ctype.h      1082938564      1003656411
-./include/debug.h      1082938566      1007200690
-./include/errors.h     1082938563      1007200690
-./include/et/com_err.h 1082938564      1000991731
-./include/et   1084053888      1007269243
-./include/ext2fs/bitops.h      1082938564      1003927524
-./include/ext2fs/ext2_err.h    1082938564      1003927524
-./include/ext2fs/ext2_io.h     1082938564      1003927524
-./include/ext2fs/ext2fs.h      1082938564      1003927524
-./include/ext2fs       1084053888      1007269243
-./include/fdisk-part.h 1082938564      1007200690
-./include/file.h       1082938564      1007200690
-./include/fs.h 1082938564      1007200690
-./include/linux/elf.h  1082938564      1000991731
-./include/linux/ext2_fs.h      1082938564      1000991731
-./include/linux/iso_fs.h       1082938564      1000991731
-./include/linux/stat.h 1082938564      1000991731
-./include/linux/types.h        1082938564      1000991731
-./include/linux        1084053888      1007269243
-./include/mac-part.h   1082938564      1007200690
-./include/md5.h        1082938564      1000991730
-./include/partition.h  1082938564      1007200690
-./include/prom.h       1082938564      1007200690
-./include/reiserfs/reiserfs.h  1082938564      1025684115
-./include/reiserfs     1084053888      1025684115
-./include/setjm2.h     1082938564      1000991730
-./include/setjmp.h     1082938564      1000991730
-./include/stdlib.h     1082938564      1000991730
-./include/string.h     1082938564      1002620217
-./include/swab.h       1082938564      1000991730
-./include/types.h      1082938564      1000991730
-./include/xfs/xfs.h    1082938563      1002101334
-./include/xfs  1084053888      1007269244
-./include/yaboot.h     1082938564      1007200690
-./include      1084053888      1007269244
-./lib/ctype.c  1082938564      1000991731
-./lib/libext2fs.a      1082938566      1003927524
-./lib/malloc.c 1082938566      1007200690
-./lib/nosys.c  1082938566      1000991731
-./lib/string.S 1082938566      1007200690
-./lib/strstr.c 1082938566      1000991731
-./lib/strtol.c 1082938566      1000991731
-./lib/vsprintf.c       1082938566      1000991731
-./lib  1084053888      1069320301
-./man/bootstrap.8      1082938566      1000991731
-./man/mkofboot.8       1082938566      1006348765
-./man/ofpath.8 1082938566      1000991731
-./man/yaboot.8 1082938566      1006348765
-./man/yaboot.conf.5    1082938566      1004256691
-./man/yabootconfig.8   1082938566      1027929577
-./man/ybin.8   1082938566      1006348765
-./man  1084053888      1027929577
-./man.patch    1082938566      1006348761
-./second/cache.S       1082938566      1007200690
-./second/cfg.c 1082938566      1007200690
-./second/cmdline.c     1082938566      1032059589
-./second/crt0.S        1082938566      1000991731
-./second/file.c        1082938566      1044868693
-./second/fs.c  1082938566      1032059574
-./second/fs_ext2.c     1082938566      1032059564
-./second/fs_iso.c      1082938566      1007200690
-./second/fs_of.c       1082938566      1032059553
-./second/fs_reiserfs.c 1082938566      1007200690
-./second/fs_xfs.c      1082938563      1032059541
-./second/iso_util.c    1082938566      1003656415
-./second/md5.c 1082938566      1032059532
-./second/partition.c   1082938566      1032059525
-./second/prom.c        1082938566      1067937197
-./second/setjmp.S      1082938566      1000991732
-./second/yaboot.c      1082938566      1032059504
-./second       1084053888      1069320301
-./util/addnote.c       1082938566      1007200691
-./util/elfextract.c    1082938566      1007303237
-./util 1084053888      1069320301
-./ybin/mkofboot        1084053888      1073219938
-./ybin/ofpath  1084053730      1083997485
-./ybin/yabootconfig    1084053741      1082931877
-./ybin/ybin    1084053724      1084053572
-./ybin 1084053888      1084053572
-.      1084053888      1084053885
+./0arch-timestamps0    1089492902      1089575531
+./BUGS 1089492902      1000991730
+./COPYING      1089492902      1000991730
+./ChangeLog    1089575479      1089575528
+./Config       1089492902      1002101497
+./INSTALL      1089492902      1000991730
+./Makefile     1089492902      1082247755
+./README       1089492902      1044766458
+./README.man.patch     1089492902      1000991730
+./THANKS       1089492902      1006350263
+./TODO 1089492902      1044766566
+./changelog    1089492902      1082248025
+./doc/Makefile 1089492904      1019310768
+./doc/README.ofboot    1089492902      1000991730
+./doc/README.ofpath    1089492902      1000991730
+./doc/README.rs6000    1089492902      1007200689
+./doc/examples/README.dualboot.chrp    1089492902      1000991730
+./doc/examples/README.mbicons  1089492902      1000991730
+./doc/examples/README.simpleboot.chrp  1089492902      1000991730
+./doc/examples/dualboot.chrp   1089492902      1068017741
+./doc/examples/large-penguin.mbicon    1089492902      1000991730
+./doc/examples/simpleboot.chrp 1089492902      1068017750
+./doc/examples/yaboot.conf.multi-boot  1089492902      1006348765
+./doc/examples/yaboot.conf.rs6000      1089492902      1006348765
+./doc/examples 1089575531      1068017750
+./doc/yaboot-howto.de.sgml     1089492904      1077455488
+./doc/yaboot-howto.sgml        1089492904      1077455511
+./doc  1089575531      1081830064
+./etc/yaboot.conf      1089492902      1006348765
+./etc  1089575531      1007269243
+./first/ofboot 1089492902      1065311880
+./first        1089575531      1071492158
+./include/asm/elf.h    1089492903      1000991730
+./include/asm/ppc_asm.tmpl     1089492903      1000991730
+./include/asm/processor.h      1089492903      1000991730
+./include/asm  1089575531      1007269243
+./include/bootinfo.h   1089492903      1007200690
+./include/byteorder.h  1089492903      1000991730
+./include/cfg.h        1089492903      1007200690
+./include/cmdline.h    1089492903      1007200690
+./include/ctype.h      1089492903      1003656411
+./include/debug.h      1089492904      1007200690
+./include/errors.h     1089492902      1007200690
+./include/et/com_err.h 1089492903      1000991731
+./include/et   1089575531      1007269243
+./include/ext2fs/bitops.h      1089492903      1003927524
+./include/ext2fs/ext2_err.h    1089492903      1003927524
+./include/ext2fs/ext2_io.h     1089492903      1003927524
+./include/ext2fs/ext2fs.h      1089492903      1003927524
+./include/ext2fs       1089575531      1007269243
+./include/fdisk-part.h 1089492903      1007200690
+./include/file.h       1089492903      1007200690
+./include/fs.h 1089492903      1007200690
+./include/linux/elf.h  1089492903      1000991731
+./include/linux/ext2_fs.h      1089492903      1000991731
+./include/linux/iso_fs.h       1089492903      1000991731
+./include/linux/stat.h 1089492903      1000991731
+./include/linux/types.h        1089492903      1000991731
+./include/linux        1089575531      1007269243
+./include/mac-part.h   1089492903      1007200690
+./include/md5.h        1089492903      1000991730
+./include/partition.h  1089492903      1007200690
+./include/prom.h       1089492903      1007200690
+./include/reiserfs/reiserfs.h  1089492903      1025684115
+./include/reiserfs     1089575531      1025684115
+./include/setjm2.h     1089492903      1000991730
+./include/setjmp.h     1089492903      1000991730
+./include/stdlib.h     1089492903      1000991730
+./include/string.h     1089492903      1002620217
+./include/swab.h       1089492903      1000991730
+./include/types.h      1089492903      1000991730
+./include/xfs/xfs.h    1089492902      1002101334
+./include/xfs  1089575531      1007269244
+./include/yaboot.h     1089492903      1007200690
+./include      1089575531      1007269244
+./lib/ctype.c  1089492903      1000991731
+./lib/libext2fs.a      1089492903      1003927524
+./lib/malloc.c 1089492903      1007200690
+./lib/nosys.c  1089492903      1000991731
+./lib/string.S 1089492903      1007200690
+./lib/strstr.c 1089492903      1000991731
+./lib/strtol.c 1089492903      1000991731
+./lib/vsprintf.c       1089492903      1000991731
+./lib  1089575531      1069320301
+./man/bootstrap.8      1089492903      1000991731
+./man/mkofboot.8       1089492903      1006348765
+./man/ofpath.8 1089492903      1000991731
+./man/yaboot.8 1089492903      1006348765
+./man/yaboot.conf.5    1089492903      1004256691
+./man/yabootconfig.8   1089492903      1027929577
+./man/ybin.8   1089492903      1006348765
+./man  1089575531      1027929577
+./man.patch    1089492903      1006348761
+./second/cache.S       1089492903      1007200690
+./second/cfg.c 1089492903      1007200690
+./second/cmdline.c     1089492904      1032059589
+./second/crt0.S        1089492904      1000991731
+./second/file.c        1089492904      1044868693
+./second/fs.c  1089492904      1032059574
+./second/fs_ext2.c     1089492904      1032059564
+./second/fs_iso.c      1089492904      1007200690
+./second/fs_of.c       1089492904      1032059553
+./second/fs_reiserfs.c 1089492904      1007200690
+./second/fs_xfs.c      1089492902      1032059541
+./second/iso_util.c    1089492904      1003656415
+./second/md5.c 1089492904      1032059532
+./second/partition.c   1089492904      1032059525
+./second/prom.c        1089492904      1067937197
+./second/setjmp.S      1089492904      1000991732
+./second/yaboot.c      1089492904      1032059504
+./second       1089575531      1069320301
+./util/addnote.c       1089492904      1007200691
+./util/elfextract.c    1089492904      1007303237
+./util 1089575531      1069320301
+./ybin/mkofboot        1089575530      1073219938
+./ybin/ofpath  1089491303      1083997485
+./ybin/ybin    1089492904      1084053572
+./ybin/yabootconfig    1089575452      1089575448
+./ybin 1089575531      1089575390
+.      1089575531      1089575528

diff --git a/ChangeLog b/ChangeLog
index c3bf9605f1a4b8bf411a138cbb5c0fa634f9cbb9..ee8bb4e873fedc33d6a79c480dd77123b67a3b91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2004-07-11 19:52:17 GMT        Ethan Benson <erbenson@alaska.net>      patch-72
+
+    Summary:
+      Add LABEL/UUID support to yabootconfig
+    Revision:
+      yaboot--devel--1.3--patch-72
+
+    * ybin/yabootconfig: Add support for LABEL= and UUID= in
+      /etc/fstab. (Colin Watson)
+
+    modified files:
+     0arch-timestamps0 ChangeLog ybin/yabootconfig
+
+
 2004-05-08 22:04:51 GMT        Ethan Benson <erbenson@alaska.net>      patch-71
 
     Summary:

diff --git a/ybin/yabootconfig b/ybin/yabootconfig
index f343a7dad1f3ba74f9894bbac5849b6f2c14d4fc..755e79cdfff89def6385cbd5facab682859f8b3e 100755 (executable)
--- a/ybin/yabootconfig
+++ b/ybin/yabootconfig
@@ -390,6 +390,21 @@ if [ -z "$ROOT" ] ; then
     fi
 fi
 
+## dereference label or uuid if necessary
+case "$ROOT" in
+    LABEL=*|UUID=*)
+       if ! (command -v findfs > /dev/null 2>&1) ; then
+           echo 1>&2 "$PRG: Unable to locate findfs, aborting..."
+           exit 1
+       fi
+       ROOT="$(findfs "$ROOT")"
+       if [ -z "$ROOT" -o $? != 0 ] ; then
+           echo 1>&2 "$PRG: Could not determine root partition, aborting..."
+           exit 1
+       fi
+       ;;
+esac
+
 ## make sure root device exists
 if [ ! -e "$ROOT" ] ; then
     echo 1>&2 "$PRG: $ROOT: No such file or directory"