| 1 |
--- |
| 2 |
targets/support/livecdfs-update.sh | 26 +++++++++----------------- |
| 3 |
1 file changed, 9 insertions(+), 17 deletions(-) |
| 4 |
|
| 5 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 6 |
index 31cdf04..ee0d813 100755 |
| 7 |
--- a/targets/support/livecdfs-update.sh |
| 8 |
+++ b/targets/support/livecdfs-update.sh |
| 9 |
@@ -78,10 +78,9 @@ fi |
| 10 |
|
| 11 |
# Setup links for ethernet devices |
| 12 |
cd /etc/init.d |
| 13 |
-ln -sf net.lo net.eth1 |
| 14 |
-ln -sf net.lo net.eth2 |
| 15 |
-ln -sf net.lo net.eth3 |
| 16 |
-ln -sf net.lo net.eth4 |
| 17 |
+for i in {1..4}; do |
| 18 |
+ln -sf net.lo net.eth${i} |
| 19 |
+done |
| 20 |
|
| 21 |
# Add this for hwsetup/mkx86config |
| 22 |
mkdir -p /etc/sysconfig |
| 23 |
@@ -105,13 +104,10 @@ fi |
| 24 |
|
| 25 |
# Tweak the livecd make.conf so that users know not to edit it |
| 26 |
# https://bugs.gentoo.org/144647 |
| 27 |
-mv ${clst_make_conf} ${clst_make_conf}.old |
| 28 |
-echo "####################################################" >> ${clst_make_conf} |
| 29 |
-echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> ${clst_make_conf} |
| 30 |
-echo "## PLEASE EDIT /mnt/gentoo${clst_make_conf} INSTEAD ##" >> ${clst_make_conf} |
| 31 |
-echo "####################################################" >> ${clst_make_conf} |
| 32 |
-cat ${clst_make_conf}.old >> ${clst_make_conf} |
| 33 |
- |
| 34 |
+echo -e "####################################################\n$(cat ${clst_make_conf})" > ${clst_make_conf} |
| 35 |
+echo -e "## PLEASE EDIT /mnt/gentoo${clst_make_conf} INSTEAD ##\n$(cat ${clst_make_conf})" > ${clst_make_conf} |
| 36 |
+echo -e "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##\n$(cat ${clst_make_conf})" > ${clst_make_conf} |
| 37 |
+echo -e "####################################################\n$(cat ${clst_make_conf})" > ${clst_make_conf} |
| 38 |
# devfs tweaks |
| 39 |
[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf |
| 40 |
|
| 41 |
@@ -299,8 +295,7 @@ case ${clst_livecd_type} in |
| 42 |
USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt |
| 43 |
|
| 44 |
# This is my hack to reduce tmpfs usage |
| 45 |
- cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd |
| 46 |
- cp -r ${clst_repo_basedir}/${clst_repo_name}/eclass /usr/livecd |
| 47 |
+ cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd |
| 48 |
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} |
| 49 |
mv -f /etc/gconf /usr/livecd |
| 50 |
ln -sf /usr/livecd/gconf /etc/gconf |
| 51 |
@@ -327,10 +322,7 @@ case ${clst_livecd_type} in |
| 52 |
# Copy our installer icons |
| 53 |
if [ -e /usr/share/applications/installer-gtk.desktop ] |
| 54 |
then |
| 55 |
- cp -f /usr/share/applications/installer-gtk.desktop \ |
| 56 |
- /home/${username}/Desktop |
| 57 |
- cp -f /usr/share/applications/installer-dialog.desktop \ |
| 58 |
- /home/${username}/Desktop |
| 59 |
+ cp -f /usr/share/applications/{installer-gtk.desktop,installer-dialog.desktop} /home/${username}/Desktop |
| 60 |
sed -i -e \ |
| 61 |
's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ |
| 62 |
/home/${username}/Desktop/installer-dialog.desktop |
| 63 |
-- |
| 64 |
2.10.2 |
Archives