--- plamo/00_base/old/sysvinit-20151222/PlamoBuild.sysvinit-2.88dsf 2015-12-22 18:27:02.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2016-03-14 19:15:52.000000000 +0900 @@ -2,11 +2,11 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-test/for-5.0/plamo-rc-scripts/plamo-rc-scripts-20151013.tgz" + ftp://plamo.linet.gr.jp/pub/Plamo-test/for-5.0/plamo-rc-scripts/plamo-rc-scripts-20160208.tgz" pkgbase=sysvinit vers=2.88dsf arch=`uname -m` -build=P15 +build=P16 src=$pkgbase-$vers OPT_CONFIG="" DOCS="doc/bootlogd.README doc/Install doc/Changelog doc/Propaganda @@ -245,17 +245,22 @@ #!/bin/sh root="`cat /proc/cmdline | sed -n 's@.*\=\([^ ]*\).*@\1@p'`" - if [ -n "`echo $root | grep "/dev/"`" ] ; then - # root=/dev/sdb1 (grub) - root_part=`echo $root | sed 's@/dev/@@'` + if grep -q "^PARTUUID=" <<< $root ; then + # root=PARTUUID= + root_part=`blkid | tr -d '"' | grep $root | cut -d: -f1 | sed 's@/dev/@@'` else - # root=821 (lilo) - maj=$((`printf "%d" 0x$root` / 256)) ; min=$((`printf "%d" 0x$root` % 256)) - root_part=`cat /proc/partitions | sed -n "/ $maj *$min /s@.* \([^ ]*\)@\1@p"` + if grep -q "^/dev/" <<< $root ; then + # root=/dev/sda1 (grub) + root_part=${root#/dev/} + else + # root=801 (lilo) + maj=$((`printf "%d" 0x$root` / 256)) + min=$((`printf "%d" 0x$root` % 256)) + root_part=`cat /proc/partitions \ + | sed -n "/ $maj *$min /s@.* \([^ ]*\)@\1@p"` + fi fi - ( cd /dev ; rm -rf root ) - ( cd /dev ; ln -sf $root_part root ) - exit 0 + ln -sf $root_part /dev/root EOF chmod 755 $P/sbin/link_rootdev.sh touch $W/i.et