* [gentoo-commits] proj/catalyst:master commit in: targets/support/, livecd/files/
2022-11-20 0:21 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, livecd/files/ Matt Turner
@ 2022-11-17 23:42 ` Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-11-17 23:42 UTC (permalink / raw
To: gentoo-commits
commit: 820fcbd2053ee21ea3024c723e31e282a7f70d6d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 02:11:30 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:41:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=820fcbd2
targets: Remove remnants of support for the installer
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
livecd/files/livecd.motd.txt | 2 --
targets/support/livecdfs-update.sh | 16 +---------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index fe4c0918..9f8e2396 100644
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,8 +1,6 @@
To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below.
There is also a rescue session for X using twm if you simply use "startx".
-You can start the installer by typing "installer" at the prompt below.
-
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
detailed information about how to reproduce the bug you are reporting.
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 3f47012b..cf2cf62f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -228,12 +228,8 @@ case ${clst_livecd_type} in
fi
fi
- # This gives us our list of system packages for the installer
- mkdir -p /usr/livecd
- ### XXX: Andrew says we don't need this anymore
- 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
-
# This is my hack to reduce tmpfs usage
+ mkdir -p /usr/livecd
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
@@ -273,16 +269,6 @@ case ${clst_livecd_type} in
[ -e /usr/share/applications/gentoo-handbook.desktop ] && \
cp -f /usr/share/applications/gentoo-handbook.desktop \
/home/${username}/Desktop
- # Copy our installer icons
- if [ -e /usr/share/applications/installer-gtk.desktop ]
- then
- cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop
- sed -i -e \
- 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
- /home/${username}/Desktop/installer-dialog.desktop
- sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
- /home/${username}/Desktop/installer-gtk.desktop
- fi
chown -R ${username}:100 /home/${username}
done
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, livecd/files/
@ 2022-11-20 0:21 Matt Turner
2022-11-17 23:42 ` [gentoo-commits] proj/catalyst:master " Matt Turner
0 siblings, 1 reply; 4+ messages in thread
From: Matt Turner @ 2022-11-20 0:21 UTC (permalink / raw
To: gentoo-commits
commit: 820fcbd2053ee21ea3024c723e31e282a7f70d6d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 02:11:30 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:41:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=820fcbd2
targets: Remove remnants of support for the installer
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
livecd/files/livecd.motd.txt | 2 --
targets/support/livecdfs-update.sh | 16 +---------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index fe4c0918..9f8e2396 100644
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,8 +1,6 @@
To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below.
There is also a rescue session for X using twm if you simply use "startx".
-You can start the installer by typing "installer" at the prompt below.
-
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
detailed information about how to reproduce the bug you are reporting.
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 3f47012b..cf2cf62f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -228,12 +228,8 @@ case ${clst_livecd_type} in
fi
fi
- # This gives us our list of system packages for the installer
- mkdir -p /usr/livecd
- ### XXX: Andrew says we don't need this anymore
- 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
-
# This is my hack to reduce tmpfs usage
+ mkdir -p /usr/livecd
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
@@ -273,16 +269,6 @@ case ${clst_livecd_type} in
[ -e /usr/share/applications/gentoo-handbook.desktop ] && \
cp -f /usr/share/applications/gentoo-handbook.desktop \
/home/${username}/Desktop
- # Copy our installer icons
- if [ -e /usr/share/applications/installer-gtk.desktop ]
- then
- cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop
- sed -i -e \
- 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
- /home/${username}/Desktop/installer-dialog.desktop
- sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
- /home/${username}/Desktop/installer-gtk.desktop
- fi
chown -R ${username}:100 /home/${username}
done
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, livecd/files/
2022-11-17 23:42 [gentoo-commits] proj/catalyst:master " Matt Turner
@ 2022-11-20 0:21 ` Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-11-20 0:21 UTC (permalink / raw
To: gentoo-commits
commit: 92d8e163d8f61a7b9776fccd106197584beae6b9
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 02:13:30 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:41:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=92d8e163
targets: Remove gconf usage
Bug: https://bugs.gentoo.org/873841
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
livecd/files/livecd-local.start | 5 -----
targets/support/livecdfs-update.sh | 24 ------------------------
2 files changed, 29 deletions(-)
diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index 3615569c..a7bb2bef 100644
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -4,11 +4,6 @@
# This is a good place to load any misc.
# programs on startup ( 1>&2 )
-#if [ -d /usr/livecd/gconf ]
-#then
-# ln -sf /usr/livecd/gconf /etc/gconf
-#fi
-
#if [ -d /usr/livecd/db ]
#then
# ln -sf /usr/livecd/db /var/db
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index cf2cf62f..b7548347 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -178,19 +178,6 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l
# Post configuration
case ${clst_livecd_type} in
gentoo-release-live*)
- # Setup Gnome theme
- if [ "${clst_livecd_xsession}" == "gnome" ]
- then
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /desktop/gnome/interface/font_name "Sans 9"
- fi
-
- # Remove locking on screensaver
- gconftool-2 --direct \
- --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s \
- -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
-
# Setup GDM
if [ "${clst_livecd_xdm}" == "gdm" ]
then
@@ -232,8 +219,6 @@ case ${clst_livecd_type} in
mkdir -p /usr/livecd
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
- mv -f /etc/gconf /usr/livecd
- ln -sf /usr/livecd/gconf /etc/gconf
mv -f /var/db /usr/livecd
ln -sf /usr/livecd/db /var/db
@@ -274,15 +259,6 @@ case ${clst_livecd_type} in
fi
;;
generic-livecd )
- # This is my hack to reduce tmpfs usage
- mkdir -p /usr/livecd
-
- if [ -d /etc/gconf ]
- then
- mv -f /etc/gconf /usr/livecd
- ln -sf /usr/livecd/gconf /etc/gconf
- fi
-
touch /etc/startx
;;
esac
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, livecd/files/
@ 2023-05-11 14:47 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2023-05-11 14:47 UTC (permalink / raw
To: gentoo-commits
commit: b66d5721d6da0bb14d5106e634e1544c53242bd9
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:33:52 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b66d5721
reorganize motd files
Having all 3 livecd targets inherit generic.motd.txt AND
minimal.motd.txt was causing some duplication of messages. Now all 3
targets inherit generic and their own single motd file.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
livecd/files/livecd.motd.txt | 8 +++++++-
livecd/files/minimal.motd.txt | 2 +-
livecd/files/universal.motd.txt | 12 ++++++++++--
targets/support/livecdfs-update.sh | 6 ++----
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index a37f53cb..029c2f6e 100644
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,5 +1,11 @@
+The latest version of the Handbook is always available from the Gentoo web
+site by typing "links https://wiki.gentoo.org/wiki/Handbook".
+
+To start an ssh server on this system, type "/etc/init.d/sshd start". If you
+need to log in remotely as root, type "passwd root" to reset root's password
+to a known value.
+
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
detailed information about how to reproduce the bug you are reporting.
Thank you for using Gentoo Linux!
-
diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt
index 3058b854..029c2f6e 100644
--- a/livecd/files/minimal.motd.txt
+++ b/livecd/files/minimal.motd.txt
@@ -7,5 +7,5 @@ to a known value.
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
detailed information about how to reproduce the bug you are reporting.
-Thank you for using Gentoo Linux!
+Thank you for using Gentoo Linux!
diff --git a/livecd/files/universal.motd.txt b/livecd/files/universal.motd.txt
index 403b8729..416d59d8 100644
--- a/livecd/files/universal.motd.txt
+++ b/livecd/files/universal.motd.txt
@@ -1,5 +1,13 @@
+The latest version of the Handbook is always available from the Gentoo web
+site by typing "links https://wiki.gentoo.org/wiki/Handbook".
Stage tarball(s), distfiles and packages can be found in /mnt/cdrom/.
-You can view the networkless installation instructions for this release by
-typing "links /mnt/cdrom/docs/handbook/html".
+To start an ssh server on this system, type "/etc/init.d/sshd start". If you
+need to log in remotely as root, type "passwd root" to reset root's password
+to a known value.
+
+Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
+detailed information about how to reproduce the bug you are reporting.
+
+Thank you for using Gentoo Linux!
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index dafe4c3a..1be4baea 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -128,8 +128,7 @@ fi
# Tweak the MOTD for Gentoo releases
case ${clst_livecd_type} in
gentoo-release-universal)
- cat /etc/generic.motd.txt /etc/universal.motd.txt \
- /etc/minimal.motd.txt > /etc/motd
+ cat /etc/generic.motd.txt /etc/universal.motd.txt > /etc/motd
sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
;;
gentoo-release-minimal)
@@ -137,8 +136,7 @@ case ${clst_livecd_type} in
sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
;;
gentoo-release-live*)
- cat /etc/generic.motd.txt \
- /etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
+ cat /etc/generic.motd.txt /etc/livecd.motd.txt > /etc/motd
sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd
;;
esac
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-11 14:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-20 0:21 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, livecd/files/ Matt Turner
2022-11-17 23:42 ` [gentoo-commits] proj/catalyst:master " Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-05-11 14:47 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2022-11-17 23:42 [gentoo-commits] proj/catalyst:master " Matt Turner
2022-11-20 0:21 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox