| 1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 2 |
--- |
| 3 |
livecd/files/livecd.motd.txt | 2 -- |
| 4 |
targets/support/livecdfs-update.sh | 16 +--------------- |
| 5 |
2 files changed, 1 insertion(+), 17 deletions(-) |
| 6 |
|
| 7 |
diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt |
| 8 |
index fe4c0918..9f8e2396 100644 |
| 9 |
--- a/livecd/files/livecd.motd.txt |
| 10 |
+++ b/livecd/files/livecd.motd.txt |
| 11 |
@@ -1,8 +1,6 @@ |
| 12 |
To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below. |
| 13 |
There is also a rescue session for X using twm if you simply use "startx". |
| 14 |
|
| 15 |
-You can start the installer by typing "installer" at the prompt below. |
| 16 |
- |
| 17 |
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include |
| 18 |
detailed information about how to reproduce the bug you are reporting. |
| 19 |
|
| 20 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 21 |
index 3f47012b..cf2cf62f 100755 |
| 22 |
--- a/targets/support/livecdfs-update.sh |
| 23 |
+++ b/targets/support/livecdfs-update.sh |
| 24 |
@@ -228,12 +228,8 @@ case ${clst_livecd_type} in |
| 25 |
fi |
| 26 |
fi |
| 27 |
|
| 28 |
- # This gives us our list of system packages for the installer |
| 29 |
- mkdir -p /usr/livecd |
| 30 |
- ### XXX: Andrew says we don't need this anymore |
| 31 |
- 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 |
| 32 |
- |
| 33 |
# This is my hack to reduce tmpfs usage |
| 34 |
+ mkdir -p /usr/livecd |
| 35 |
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd |
| 36 |
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} |
| 37 |
mv -f /etc/gconf /usr/livecd |
| 38 |
@@ -273,16 +269,6 @@ case ${clst_livecd_type} in |
| 39 |
[ -e /usr/share/applications/gentoo-handbook.desktop ] && \ |
| 40 |
cp -f /usr/share/applications/gentoo-handbook.desktop \ |
| 41 |
/home/${username}/Desktop |
| 42 |
- # Copy our installer icons |
| 43 |
- if [ -e /usr/share/applications/installer-gtk.desktop ] |
| 44 |
- then |
| 45 |
- cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop |
| 46 |
- sed -i -e \ |
| 47 |
- 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ |
| 48 |
- /home/${username}/Desktop/installer-dialog.desktop |
| 49 |
- sed -i -e 's:Exec=installer-gtk:Exec=installer:' \ |
| 50 |
- /home/${username}/Desktop/installer-gtk.desktop |
| 51 |
- fi |
| 52 |
chown -R ${username}:100 /home/${username} |
| 53 |
done |
| 54 |
fi |
| 55 |
-- |
| 56 |
2.37.4 |
Archives