summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xautoinstaller.sh6
-rwxr-xr-xsys-apps/baselayout/files/rc.d/init.d/pretty4
-rwxr-xr-xsys-apps/bootdisk/files/mkcd4.sh1
3 files changed, 6 insertions, 5 deletions
diff --git a/autoinstaller.sh b/autoinstaller.sh
index e6679b08b177..0ae334687359 100755
--- a/autoinstaller.sh
+++ b/autoinstaller.sh
@@ -39,10 +39,10 @@ echo "Swap partition in /dev/$MYSWAPPART"
sed -e "s/#ROOT#/${MYROOTPART}/" -e "s/#SWAP#/${MYSWAPPART}/" ${ROOT}/etc/fstab.orig > ${ROOT}/etc/fstab
echo "Generating library links and cache..."
-cp ${ROOT}/etc/ld.so.conf ${ROOT}/etc/ld.so.orig
-sed -e "s/i686-pc-linux-gnu/$ARCH/" ${ROOT}/etc/ld.so.orig > ${ROOT}/etc/ld.so.conf
+cp ${ROOT}/etc/env.d/00basic ${ROOT}/etc/env.d/00basic.orig
+sed -e "s/i686-pc-linux-gnu/$ARCH/" ${ROOT}/etc/env.d/00basic.orig > ${ROOT}/etc/env.d/00basic
-ldconfig -r ${ROOT}
+${ROOT}/usr/sbin/env-update
case "$GMT" in
n|N|No|no)
diff --git a/sys-apps/baselayout/files/rc.d/init.d/pretty b/sys-apps/baselayout/files/rc.d/init.d/pretty
index 157728020ea4..9488c379403f 100755
--- a/sys-apps/baselayout/files/rc.d/init.d/pretty
+++ b/sys-apps/baselayout/files/rc.d/init.d/pretty
@@ -11,9 +11,9 @@ fi
if [ -e /usr/bin/consolechars ]
then
- /usr/bin/consolechars -f ${CONSOLEFONT}
+ /usr/bin/consolechars --font=${CONSOLEFONT}
fi
-einfo "Booting Gentoo Linux 1.0 (Release Candidate 3)"
+einfo "Booting Gentoo Linux 1.0 (Release Candidate 4)"
einfo "(All boot info logged to /var/log/boot)"
echo
sleep 1
diff --git a/sys-apps/bootdisk/files/mkcd4.sh b/sys-apps/bootdisk/files/mkcd4.sh
index 74f1d7b6c429..c922393fcf1e 100755
--- a/sys-apps/bootdisk/files/mkcd4.sh
+++ b/sys-apps/bootdisk/files/mkcd4.sh
@@ -142,6 +142,7 @@ mkbootimg() {
cp /sbin/rpc.statd .
ln -s insmod modprobe
+ ln -s insmod rmmod
ln -s mkraid raid0run
ln -s raidstart raidhotadd
ln -s raidstart raidhotremove