[gentoo-catalyst] [PATCH 01/10] remove gamecd motd file

[gentoo-catalyst] [PATCH 01/10] remove gamecd motd file

[Ben Kohler]

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 livecd/files/gamecd.motd.txt | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 livecd/files/gamecd.motd.txt

diff --git a/livecd/files/gamecd.motd.txt b/livecd/files/gamecd.motd.txt
deleted file mode 100644
index 7ee2d9c2..00000000
--- a/livecd/files/gamecd.motd.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-To (re)start ##GAME_NAME, please type "startx" 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.
-
-Thank you for using Gentoo Linux!
-
-- 
2.40.0

[gentoo-catalyst] [PATCH 02/10] reorganize motd files

[Ben Kohler]

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@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
-- 
2.40.0

[gentoo-catalyst] [PATCH 03/10] livecdfs-update.sh: remove code obsoleted by sys-apps/hwids package

[Ben Kohler]

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 1be4baea..a2ac26c8 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -101,30 +101,6 @@ alias ll='ls -l'
 alias grep='grep --color=auto'
 EOF
 
-# Make sure we have the latest pci,usb and hotplug ids.  Older versions of
-# pciutils and usbutils used /sbin, where newer versions use /usr/sbin.
-[ -x /sbin/update-pciids ] && /sbin/update-pciids
-[ -x /sbin/update-usbids ] && /sbin/update-usbids
-[ -x /usr/sbin/update-pciids ] && /usr/sbin/update-pciids
-[ -x /usr/sbin/update-usbids ] && /usr/sbin/update-usbids
-if [ -d /usr/share/hwdata ]
-then
-	# If we have uncompressed pci and usb ids files, symlink them.
-	[ -f /usr/share/misc/pci.ids ] && [ -f /usr/share/hwdata/pci.ids ] && \
-		rm -f /usr/share/hwdata/pci.ids && ln -s /usr/share/misc/pci.ids \
-		/usr/share/hwdata/pci.ids
-	[ -f /usr/share/misc/usb.ids ] && [ -f /usr/share/hwdata/usb.ids ] && \
-		rm -f /usr/share/hwdata/usb.ids && ln -s /usr/share/misc/usb.ids \
-		/usr/share/hwdata/usb.ids
-	# If we have compressed pci and usb files, we download our own copies.
-	[ -f /usr/share/misc/pci.ids.gz ] && [ -f /usr/share/hwdata/pci.ids ] && \
-		rm -f /usr/share/hwdata/pci.ids && wget -O /usr/share/hwdata/pci.ids \
-		http://pciids.sourceforge.net/v2.2/pci.ids
-	[ -f /usr/share/misc/usb.ids.gz ] && [ -f /usr/share/hwdata/usb.ids ] && \
-		rm -f /usr/share/hwdata/usb.ids && wget -O /usr/share/hwdata/usb.ids \
-		http://www.linux-usb.org/usb.ids
-fi
-
 # Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
 	gentoo-release-universal)
-- 
2.40.0

[gentoo-catalyst] [PATCH 04/10] livecdfs-update.sh: remove old devfsd code

[Ben Kohler]

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a2ac26c8..9e0fd6cc 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -88,9 +88,6 @@ cat <<EOF > ${clst_make_conf}
 EOF
 cat ${clst_make_conf}.old >> ${clst_make_conf}
 
-# devfs tweaks
-[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
-
 # Add some helpful aliases
 cat <<EOF >> /etc/profile
 alias cp='cp -i'
-- 
2.40.0

[gentoo-catalyst] [PATCH 05/10] livecdfs-update.sh: remove net.eth[1234] symlinks

[Ben Kohler]

I don't think these are providing any value to anyone, since interfaces
don't get eth* names by default and very few livecd users will be using
netifrc anyway.

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 9e0fd6cc..ca8997f7 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -60,12 +60,6 @@ then
 	sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
 fi
 
-# Setup links for ethernet devices
-cd /etc/init.d
-for i in {1..4}; do
-	ln -sf net.lo net.eth${i}
-done
-
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig
 
-- 
2.40.0

[gentoo-catalyst] [PATCH 06/10] livecdfs-update.sh: remove confusing "reduce tmpfs usage" hack

[Ben Kohler]

I don't believe this provides any real value now, and it makes the
livecd layout confusing.

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index ca8997f7..16e201d5 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -113,13 +113,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*)
-		# 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 /var/db /usr/livecd
-		ln -sf /usr/livecd/db /var/db
-
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 
-- 
2.40.0

[gentoo-catalyst] [PATCH 07/10] livecdfs-update.sh: replace local handbook with wiki handbook

[Ben Kohler]

Code to look for a local html handbook is obsolete.  Link to the wiki
handbook instead, and install the entry unconditionally for gentoo
targets.

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 32 ++++++++++++------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 16e201d5..bf19ccf5 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -112,28 +112,22 @@ 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*)
+	gentoo-release-*)
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 
-		create_handbook_icon() {
-			cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
-				[Desktop Entry]
-				Encoding=UTF-8
-				Version=1.0
-				Type=Link
-				URL=file:///mnt/cdrom/docs/handbook/html/index.html
-				Terminal=false
-				Name=Gentoo Linux Handbook
-				GenericName=Gentoo Linux Handbook
-				Comment=This is a link to the local copy of the Gentoo Linux Handbook.
-				Icon=text-editor
-			EOF
-		}
-
-		# Create our Handbook icon
-		[ -e /docs/handbook/index.html ] && create_handbook_icon
-		[ -n "${clst_livecd_overlay}" ] && [ -e ${clst_livecd_overlay}/docs/handbook/index.html ] && create_handbook_icon
+		cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
+			[Desktop Entry]
+			Encoding=UTF-8
+			Version=1.0
+			Type=Link
+			URL=https://wiki.gentoo.org/wiki/Handbook:Main_Page
+			Terminal=false
+			Name=Gentoo Linux Handbook
+			GenericName=Gentoo Linux Handbook
+			Comment=This is a link to Gentoo Linux Handbook.
+			Icon=text-editor
+		EOF
 
 		# Copy our icons into place and build home directories
 		if [ -n "${clst_livecd_users}" ]
-- 
2.40.0

[gentoo-catalyst] [PATCH 08/10] livecdfs-update, livecd-bashrc: remove archaic X autostarting setup

[Ben Kohler]

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 livecd/files/livecd-bashrc         | 13 -------------
 targets/support/livecdfs-update.sh |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index 18b8f1d8..a9bf588e 100644
--- a/livecd/files/livecd-bashrc
+++ b/livecd/files/livecd-bashrc
@@ -1,14 +1 @@
 #!/bin/bash
-
-if [ ! "$(grep nox /proc/cmdline)" ]
-then
-	if [ -x /usr/bin/X ]
-	then
-		if [ -e /etc/startx -a $(tty) = "/dev/tty1" ];
-		then
-			rm -f /etc/startx
-			##STARTX
-			[ -f /etc/motd ] && cat /etc/motd
-		fi
-	fi
-fi
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index bf19ccf5..d4548020 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -144,16 +144,9 @@ case ${clst_livecd_type} in
 		fi
 		;;
 	generic-livecd )
-		touch /etc/startx
 		;;
 esac
 
-# We want the first user to be used when auto-starting X
-if [ -e /etc/startx ]
-then
-	sed -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc
-fi
-
 if [ -e /lib/rcscripts/addons/udev-start.sh ]
 then
 	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
-- 
2.40.0

[gentoo-catalyst] [PATCH 09/10] livecdfs-update: remove old evms code

[Ben Kohler]

Mostly obsoleted by LVM almost 20 years ago

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index d4548020..05714c52 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -147,9 +147,4 @@ case ${clst_livecd_type} in
 		;;
 esac
 
-if [ -e /lib/rcscripts/addons/udev-start.sh ]
-then
-	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
-fi
-
 env-update
-- 
2.40.0

[gentoo-catalyst] [PATCH 10/10] Remove obsolete universal cd target

[Ben Kohler]

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 doc/catalyst-spec.5.txt              |  1 -
 examples/livecd-stage2_template.spec |  1 -
 livecd/files/universal.motd.txt      | 13 -------------
 targets/livecd-stage2/controller.sh  |  1 -
 targets/support/livecdfs-update.sh   |  6 +-----
 5 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 livecd/files/universal.motd.txt

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index fd2926fb..96f9f3bd 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -104,7 +104,6 @@ This option controls quite a bit of catalyst internals and sets up
 several defaults.  Each type behaves slightly differently and is
 explained below.
   `gentoo-release-minimal`;; This creates an official minimal InstallCD.
-  `gentoo-release-universal`;; This creates an official universal InstallCD.
   `gentoo-release-livecd`;; This creates an official LiveCD environment.
   `generic-livecd`;; This should be used for all non-official media.
 
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index adf0acaf..b0d2ecd6 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -135,7 +135,6 @@ livecd/linuxrc:
 # This option controls quite a bit of catalyst internals and sets up several
 # defaults.  Each type behaves slightly differently and is explained below.
 # gentoo-release-minimal - This creates an official minimal InstallCD.
-# gentoo-release-universal - This creates an official universal InstallCD.
 # gentoo-release-livecd - This creates an official LiveCD environment.
 # generic-livecd - This should be used for all non-official media.
 # example:
diff --git a/livecd/files/universal.motd.txt b/livecd/files/universal.motd.txt
deleted file mode 100644
index 416d59d8..00000000
--- a/livecd/files/universal.motd.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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/.
-
-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/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh
index 9aba8167..cced07d2 100755
--- a/targets/livecd-stage2/controller.sh
+++ b/targets/livecd-stage2/controller.sh
@@ -64,7 +64,6 @@ case $1 in
 
 	clean)
 		if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \
-		|| [ "${clst_livecd_type}" = "gentoo-release-universal" ]
 		then
 			# Clean out man, info and doc files
 			rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/*
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 05714c52..687b9d4e 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -94,10 +94,6 @@ EOF
 
 # Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
-	gentoo-release-universal)
-		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)
 		cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
@@ -108,7 +104,7 @@ case ${clst_livecd_type} in
 	;;
 esac
 
-rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt
+rm -f /etc/generic.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt
 
 # Post configuration
 case ${clst_livecd_type} in
-- 
2.40.0

Re: [gentoo-catalyst] [PATCH 05/10] livecdfs-update.sh: remove net.eth[1234] symlinks

[Christian Iwata Nilsson]

[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]

Don't know if it applies, but I always start systems (and livecds) without
the (un)predictablenetworknames brokenness. So that it is always ethx and
nothing else.

So before removing this, I would like to ask to please ensure that scenario
keeps working.

On Wed, 29 Mar 2023, 21:31 Ben Kohler, <bkohler@gentoo.org> wrote:

> I don't think these are providing any value to anyone, since interfaces
> don't get eth* names by default and very few livecd users will be using
> netifrc anyway.
>
> Signed-off-by: Ben Kohler <bkohler@gentoo.org>
> ---
>  targets/support/livecdfs-update.sh | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/targets/support/livecdfs-update.sh
> b/targets/support/livecdfs-update.sh
> index 9e0fd6cc..ca8997f7 100755
> --- a/targets/support/livecdfs-update.sh
> +++ b/targets/support/livecdfs-update.sh
> @@ -60,12 +60,6 @@ then
>         sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
>  fi
>
> -# Setup links for ethernet devices
> -cd /etc/init.d
> -for i in {1..4}; do
> -       ln -sf net.lo net.eth${i}
> -done
> -
>  # Add this for hwsetup/mkx86config
>  mkdir -p /etc/sysconfig
>
> --
> 2.40.0
>
>
>

[-- Attachment #2: Type: text/html, Size: 1701 bytes --]

Re: [gentoo-catalyst] [PATCH 05/10] livecdfs-update.sh: remove net.eth[1234] symlinks

[Ben Kohler]

On Wed, Mar 29, 2023 at 2:40 PM Christian Iwata Nilsson
<nikize@gmail.com> wrote:
>
> Don't know if it applies, but I always start systems (and livecds) without the (un)predictablenetworknames brokenness. So that it is always ethx and nothing else.
>
> So before removing this, I would like to ask to please ensure that scenario keeps working.

Replying from my other email address here due to firewall issues--

I'm not stopping you from using ethX interface names.

By default our livecds start a dhcpcd instance to autoconfigure any
interface with a link detected, my change won't affect that behavior.
If dhcpcd autoconfig is not suitable, our docs point you to net-setup
for manual configuration, my change won't affect that behavior either.

If you decide to go a 3rd route and use netifrc, you will need to
manually create the net.ethX link(s).  Users with
default/"predictable" interface names already would have to do this.

Are you sure you're actually affected by my change?

Thanks,
Ben

Re: [gentoo-catalyst] [PATCH 10/10] Remove obsolete universal cd target

[Matt Turner]

The series looks good to me. Thanks for the cleanups!