You have been requested to review the proposed merge of ~vorlon/casper:cleanup
into casper:main.
For more details, see:
https://code.launchpad.net/~vorlon/casper/+git/casper/+merge/452496
Should be merged after mantic release, not before.
--
Your team Ubuntu Budgie Developers is requested to review the proposed merge of
~vorlon/casper:cleanup into casper:main.
diff --git a/debian/changelog b/debian/changelog
index c131f39..1bdc544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,45 @@
casper (1.485) UNRELEASED; urgency=medium
+<<<<<<< debian/changelog
* Text-only fixes.
-- Steve Langasek <steve.langa...@ubuntu.com> Sat, 30 Sep 2023 22:24:30 -0700
+=======
+ * Drop various initramfs scripts that are no longer needed:
+ - 07remove_oem_config: oem-config is only seeded in 'ship*' seeds, so
+ not installed in any live systems; therefore it never needs to be
+ removed.
+ - 16disable_gpt_auto_mount: gpt generator no longer shipped in systemd.
+ - 26serialtty: upstart-specific.
+ - 32disable_hibernation: now disabled in policykit-desktop-privileges in
+ desktop-common.
+ - 36disable_trackerd: trackerd no longer exists.
+ - 48kubuntu_disable_restart_notifications:
+ /usr/share/kubuntu-default-settings/kde4-profile/ no longer exists,
+ if this is still needed it needs to be implemented differently.
+ - 49kubuntu_mobile_session: kubuntu-mobile-default-settings is obsolete.
+ - 50ubiquity-bluetooth-agent: bluetooth-applet no longer exists.
+ - 51unity8_wizard: unity8 no longer exists (ubuntu-unity is unity 7).
+ * 12fstab: /etc/rcS.d/S*checkroot.sh is obsolete, no need to remove.
+ * 15autologin: remove obsolete fix-up specific to kubuntu-active.
+ * 15autologin: remove obsolete fix-up for
+ /usr/share/xsessions/QLubuntu.desktop.
+ * 18hostname: don't invoke hostname here, it will be set from the rootfs
+ at boot anyway.
+ * 25adduser: drop code for Ubuntu MID, which was obsolete before Lucid
+ released in 2010.
+ * 25configure_init: drop code specific to sysvinit, upstart, and
+ ureadahead.
+ * 31disable_update_notifier: drop handling of obsolete adept_notifier.
+ * 34disable_kde_services: don't try to remove obsolete desktop files.
+ * 35fix_language_selector: drop references to obsolete fontconfig-voodoo.
+ * 35fix_language_selector:
+ /usr/share/applications/language-selector.desktop no longer exists, but
+ /usr/share/budgie-desktop/applications/language-selector.desktop does,
+ so apply our fix there
+
+ -- Steve Langasek <steve.langa...@ubuntu.com> Sat, 30 Sep 2023 16:52:05 -0700
+>>>>>>> debian/changelog
casper (1.484) mantic; urgency=medium
diff --git a/scripts/casper-bottom/07remove_oem_config b/scripts/casper-bottom/07remove_oem_config
deleted file mode 100755
index 085abc9..0000000
--- a/scripts/casper-bottom/07remove_oem_config
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Removing oem-config if installed..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-load_confmodule
-
-# Reset oem-config/enable to false (for persistent installs)
-db_set oem-config/enable false
-
-# Only do this on ARM
-if ! uname -m | grep -q arm; then exit 0; fi
-
-log_begin_msg "$DESCRIPTION"
-
-# if oem-config is installed, we need to remove it to remove the desktop
-# file diversion, and to remove the OEM icons from showing up before we
-# install the image.
-
-chroot /root apt-get -y --purge remove oem-config </dev/null || true
-
-log_end_msg
diff --git a/scripts/casper-bottom/12fstab b/scripts/casper-bottom/12fstab
index b6328e3..45644bb 100755
--- a/scripts/casper-bottom/12fstab
+++ b/scripts/casper-bottom/12fstab
@@ -26,6 +26,4 @@ overlay / overlay rw 0 0
tmpfs /tmp tmpfs nosuid,nodev 0 0
EOF
-rm -f /root/etc/rcS.d/S*checkroot.sh
-
log_end_msg
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index c80e205..bc3805c 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -74,11 +74,6 @@ autologin-user-timeout=0"
fi
sed -i "s/\[SeatDefaults\]/\[SeatDefaults\]\n$AutologinParameters/" $LightDMCustomFile
fi
-
- # LightDM on kubuntu-active wants to start ubuntu.desktop, workaround here for now jriddell 2012-03-15
- if [ -e /root/usr/share/xsessions/plasma-active.desktop ]; then
- cp /root/usr/share/xsessions/plasma-active.desktop /root/usr/share/xsessions/ubuntu.desktop
- fi
fi
if [ -f /root/usr/bin/sddm ]; then
@@ -86,9 +81,6 @@ if [ -f /root/usr/bin/sddm ]; then
if [ -f /root/usr/share/xsessions/Lubuntu.desktop ]; then
sddm_session=Lubuntu.desktop
fi
- if [ -f /root/usr/share/xsessions/QLubuntu.desktop ]; then
- sddm_session=QLubuntu.desktop
- fi
cat >>/root/etc/sddm.conf <<EOF
[Autologin]
User=$USERNAME
diff --git a/scripts/casper-bottom/16disable_gpt_auto_mount b/scripts/casper-bottom/16disable_gpt_auto_mount
deleted file mode 100755
index c1b3a6e..0000000
--- a/scripts/casper-bottom/16disable_gpt_auto_mount
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Disabling systemd's GPT auto generator..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-rm -f /root/lib/systemd/system-generators/systemd-gpt-auto-generator
-log_end_msg
diff --git a/scripts/casper-bottom/18hostname b/scripts/casper-bottom/18hostname
index b16e191..e23b909 100755
--- a/scripts/casper-bottom/18hostname
+++ b/scripts/casper-bottom/18hostname
@@ -34,6 +34,5 @@ ff02::2 ip6-allrouters
ff02::3 ip6-allhosts
EOF
-hostname "$HOST"
log_end_msg
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
index efbf567..3e94e1d 100755
--- a/scripts/casper-bottom/25adduser
+++ b/scripts/casper-bottom/25adduser
@@ -118,18 +118,4 @@ if [ -f "/root/usr/bin/plasma-netbook" ]; then
fi
fi
-#Ubuntu MID wants to be installed with --automatic
-if [ -f "/root/usr/share/ubuntu-mid-default-settings/mid-gui-start" ]; then
- if [ -f "/root/usr/share/applications/ubiquity.desktop" ]; then
- sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity.desktop"
- fi
-fi
-
-#Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
-if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]; then
- if [ -f "/root/etc/xdg/menus/home.menu" ]; then
- sed -i '/<\/Include>/i\ <Filename>ubiquity.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
- fi
-fi
-
log_end_msg
diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init
index eafff1f..76ec6a1 100755
--- a/scripts/casper-bottom/25configure_init
+++ b/scripts/casper-bottom/25configure_init
@@ -20,26 +20,7 @@ esac
log_begin_msg "$DESCRIPTION"
-# Arrange for shells on virtual consoles, rather than login prompts
-
if [ -n "$USERNAME" ]; then
- if [ -f /root/etc/inittab ]; then
- sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
- fi
- if [ "/root/etc/init/tty*" != "$(echo /root/etc/init/tty*)" ]; then
- for f in /root/etc/init/tty*; do
- sed -i -e "s|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f .conf) > /dev/$(basename $f .conf) 2>\&1|" $f
- done
- for x in $(cat /proc/cmdline); do
- case $x in
- textonly|automatic-ubiquity|only-ubiquity|noninteractive)
- rm -f /root/etc/rc?.d/[SK]??[gkx]dm
- rm -f /root/etc/rc?.d/[SK]??sddm
- ;;
- esac
- done
- fi
-
# Since we use autologin, lastlog doesn't make sense on the console.
sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login
fi
@@ -51,23 +32,6 @@ if [ -x /root/usr/sbin/anacron ]; then
ln -s /bin/true /root/usr/sbin/anacron
fi
-# No point, really
-rm -f /root/etc/rc?.d/[SK]??postfix
-
-# Avoid clobbering the user's clock
-rm -f /root/etc/rc?.d/K??hwclock.sh /root/etc/init/hwclock-save.conf
-
-# Disable readahead since it doesn't play well with squashfs + unionfs
-# use chmod instead of mv to not trigger unionfs bugs.
-if [ -e /root/sbin/readahead-list ]; then
- chmod -x /root/sbin/readahead-list
-fi
-
-# Disable ureadahead too since we don't ship a pack file for it anyway, so
-# all we'll end up doing is profiling the live CD boot. ureadahead also
-# breaks partman occasionally by reading from its synchronisation FIFOs.
-rm -f /root/etc/init/ureadahead*.conf
-
log_end_msg
exit 0
diff --git a/scripts/casper-bottom/26serialtty b/scripts/casper-bottom/26serialtty
deleted file mode 100755
index c5736d7..0000000
--- a/scripts/casper-bottom/26serialtty
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-DESCRIPTION="Setting up a serial tty..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-
-for x in $(cat /proc/cmdline); do
- case $x in
- serialtty=*)
- tty=${x#serialtty=}
- log_begin_msg "$DESCRIPTION"
- cat > /root/etc/init/${tty}.conf <<EOF
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/getty -L 115200 ${tty} vt100
-EOF
- log_end_msg
- ;;
- esac
-done
diff --git a/scripts/casper-bottom/31disable_update_notifier b/scripts/casper-bottom/31disable_update_notifier
index 51b8e77..6198ecf 100755
--- a/scripts/casper-bottom/31disable_update_notifier
+++ b/scripts/casper-bottom/31disable_update_notifier
@@ -27,10 +27,6 @@ chroot /root dpkg-divert --add --rename --quiet \
/usr/lib/update-notifier/apt-check
ln -sf /bin/true /root/usr/lib/update-notifier/apt-check
-# For KDE, adept_notifier's only useful function at the moment is an
-# 'apt-get update' equivalent, so we disable it entirely.
-rm -f /root/usr/share/autostart/adept_notifier_auto.desktop
-
# Upgrading the live CD to new releases is probably not a great plan.
chroot /root dpkg-divert --add --rename --quiet \
/usr/lib/ubuntu-release-upgrader/check-new-release
diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation
deleted file mode 100755
index 7a6d9b7..0000000
--- a/scripts/casper-bottom/32disable_hibernation
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Configuring power management..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-cat <<EOF > /root/var/lib/polkit-1/localauthority/50-local.d/disable-hibernate.pkla
-[Disable hibernate in live system]
-Identity=unix-user:*
-Action=org.freedesktop.upower.hibernate
-ResultActive=no
-EOF
-
-log_end_msg
diff --git a/scripts/casper-bottom/34disable_kde_services b/scripts/casper-bottom/34disable_kde_services
index 3a2272c..5a7355a 100755
--- a/scripts/casper-bottom/34disable_kde_services
+++ b/scripts/casper-bottom/34disable_kde_services
@@ -20,18 +20,6 @@ esac
log_begin_msg "$DESCRIPTION"
-rm -f /root/usr/share/autostart/kab2kabc.desktop
-rm -f /root/usr/share/autostart/kaddressbookmigrator.desktop
-rm -f /root/usr/share/autostart/korgac.desktop
-rm -f /root/usr/share/autostart/printer-applet.desktop
-rm -f /root/usr/share/autostart/nepomukserver.desktop
-rm -f /root/usr/share/kde4/services/kded/kpackagekitd.desktop
-if [ -z "${PERSISTENT}" ]; then
- rm -f /root/usr/share/kde4/services/kded/freespacenotifier.desktop
-fi
-rm -f /root/usr/share/kde4/services/plasma-runner-contacts.desktop # starts akonadi
-rm -f /root/usr/share/kde4/services/plasma-dataengine-calendar.desktop # starts akonadi
-
for pkg in kubuntu-default-settings ubuntustudio; do
settingsdir="/root/usr/share/$pkg/kf5-settings"
[ -d "$settingsdir" ] || continue
diff --git a/scripts/casper-bottom/35fix_language_selector b/scripts/casper-bottom/35fix_language_selector
index 96ea67c..cbad6a9 100755
--- a/scripts/casper-bottom/35fix_language_selector
+++ b/scripts/casper-bottom/35fix_language_selector
@@ -20,15 +20,12 @@ esac
log_begin_msg "$DESCRIPTION"
-if [ -e /rofs/usr/share/applications/language-selector.desktop ]; then
+if [ -e /rofs/usr/share/budgie-desktop/applications/language-selector.desktop ]
+then
sed '/^Exec/ s|/usr/bin/gnome-language-selector|& -n|' \
- /rofs/usr/share/applications/language-selector.desktop \
- > /root/usr/share/applications/language-selector.desktop
+ /rofs/usr/share/budgie-desktop/applications/language-selector.desktop \
+ > /root/usr/share/budgie-desktop/applications/language-selector.desktop
fi
-if [ -x /root/usr/bin/fontconfig-voodoo ]; then
- chroot /root fontconfig-voodoo --auto --quiet || true
-fi
-
log_end_msg
diff --git a/scripts/casper-bottom/36disable_trackerd b/scripts/casper-bottom/36disable_trackerd
deleted file mode 100755
index 9864de1..0000000
--- a/scripts/casper-bottom/36disable_trackerd
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-DESCRIPTION="Disabling trackerd..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-rm -f /root/etc/xdg/autostart/tracker-applet.desktop \
- /root/etc/xdg/autostart/trackerd.desktop \
- /root/usr/share/autostart/trackerd.desktop
-
-log_end_msg
diff --git a/scripts/casper-bottom/48kubuntu_disable_restart_notifications b/scripts/casper-bottom/48kubuntu_disable_restart_notifications
deleted file mode 100755
index f3f96dc..0000000
--- a/scripts/casper-bottom/48kubuntu_disable_restart_notifications
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-if [ -d /root/usr/share/kubuntu-default-settings/ ]; then
- echo "[Event]\nhideRestartNotifier=true" >> /root/usr/share/kubuntu-default-settings/kde4-profile/default/share/config/notificationhelper
-fi
diff --git a/scripts/casper-bottom/49kubuntu_mobile_session b/scripts/casper-bottom/49kubuntu_mobile_session
deleted file mode 100755
index 5bdfa61..0000000
--- a/scripts/casper-bottom/49kubuntu_mobile_session
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-if [ -d /root/usr/share/kubuntu-mobile-default-settings/ ]; then
- cp /root/usr/share/kubuntu-mobile-default-settings/share/nodm /root/etc/default/nodm
-fi
diff --git a/scripts/casper-bottom/50ubiquity-bluetooth-agent b/scripts/casper-bottom/50ubiquity-bluetooth-agent
deleted file mode 100755
index b1bb791..0000000
--- a/scripts/casper-bottom/50ubiquity-bluetooth-agent
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-if [ -f /root/usr/bin/ubiquity-bluetooth-agent ] &&
- [ -f /root/usr/bin/bluetooth-applet ] &&
- [ ! -L /root/usr/bin/bluetooth-applet ]; then
- chroot /root dpkg-divert --package casper --divert /usr/bin/bluetooth-applet.orig --rename /usr/bin/bluetooth-applet
- ln -s ubiquity-bluetooth-agent /root/usr/bin/bluetooth-applet
-fi
diff --git a/scripts/casper-bottom/51unity8_wizard b/scripts/casper-bottom/51unity8_wizard
deleted file mode 100755
index 6ef02f8..0000000
--- a/scripts/casper-bottom/51unity8_wizard
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Disabling unity8's first run wizard..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-# Users want to try unity8, not to configure their system
-mkdir -p /root/home/$USERNAME/.config/ubuntu-system-settings
-touch /root/home/$USERNAME/.config/ubuntu-system-settings/wizard-has-run
-chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.config
-
-log_end_msg
--
Mailing list: https://launchpad.net/~ubuntubudgie-dev
Post to : ubuntubudgie-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntubudgie-dev
More help : https://help.launchpad.net/ListHelp
