| 1 |
Bug: https://bugs.gentoo.org/873841 |
| 2 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 3 |
--- |
| 4 |
livecd/files/livecd-local.start | 5 ----- |
| 5 |
targets/support/livecdfs-update.sh | 24 ------------------------ |
| 6 |
2 files changed, 29 deletions(-) |
| 7 |
|
| 8 |
diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start |
| 9 |
index 3615569c..a7bb2bef 100644 |
| 10 |
--- a/livecd/files/livecd-local.start |
| 11 |
+++ b/livecd/files/livecd-local.start |
| 12 |
@@ -4,11 +4,6 @@ |
| 13 |
# This is a good place to load any misc. |
| 14 |
# programs on startup ( 1>&2 ) |
| 15 |
|
| 16 |
-#if [ -d /usr/livecd/gconf ] |
| 17 |
-#then |
| 18 |
-# ln -sf /usr/livecd/gconf /etc/gconf |
| 19 |
-#fi |
| 20 |
- |
| 21 |
#if [ -d /usr/livecd/db ] |
| 22 |
#then |
| 23 |
# ln -sf /usr/livecd/db /var/db |
| 24 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 25 |
index cf2cf62f..b7548347 100755 |
| 26 |
--- a/targets/support/livecdfs-update.sh |
| 27 |
+++ b/targets/support/livecdfs-update.sh |
| 28 |
@@ -178,19 +178,6 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l |
| 29 |
# Post configuration |
| 30 |
case ${clst_livecd_type} in |
| 31 |
gentoo-release-live*) |
| 32 |
- # Setup Gnome theme |
| 33 |
- if [ "${clst_livecd_xsession}" == "gnome" ] |
| 34 |
- then |
| 35 |
- gconftool-2 --direct \ |
| 36 |
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ |
| 37 |
- --type string --set /desktop/gnome/interface/font_name "Sans 9" |
| 38 |
- fi |
| 39 |
- |
| 40 |
- # Remove locking on screensaver |
| 41 |
- gconftool-2 --direct \ |
| 42 |
- --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s \ |
| 43 |
- -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null |
| 44 |
- |
| 45 |
# Setup GDM |
| 46 |
if [ "${clst_livecd_xdm}" == "gdm" ] |
| 47 |
then |
| 48 |
@@ -232,8 +219,6 @@ case ${clst_livecd_type} in |
| 49 |
mkdir -p /usr/livecd |
| 50 |
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd |
| 51 |
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} |
| 52 |
- mv -f /etc/gconf /usr/livecd |
| 53 |
- ln -sf /usr/livecd/gconf /etc/gconf |
| 54 |
mv -f /var/db /usr/livecd |
| 55 |
ln -sf /usr/livecd/db /var/db |
| 56 |
|
| 57 |
@@ -274,15 +259,6 @@ case ${clst_livecd_type} in |
| 58 |
fi |
| 59 |
;; |
| 60 |
generic-livecd ) |
| 61 |
- # This is my hack to reduce tmpfs usage |
| 62 |
- mkdir -p /usr/livecd |
| 63 |
- |
| 64 |
- if [ -d /etc/gconf ] |
| 65 |
- then |
| 66 |
- mv -f /etc/gconf /usr/livecd |
| 67 |
- ln -sf /usr/livecd/gconf /etc/gconf |
| 68 |
- fi |
| 69 |
- |
| 70 |
touch /etc/startx |
| 71 |
;; |
| 72 |
esac |
| 73 |
-- |
| 74 |
2.37.4 |
Archives