Ubuntu
casper package

Merge ~scarlettmoore/ubuntu/+source/casper:main into ubuntu/+source/casper:ubuntu/devel

  1. Git
  2. lp:~scarlettmoore/ubuntu/+source/casper
  3. main
  4. Merge into ubuntu/devel
Proposed by Scarlett Gately Moore
Status: Needs review
Proposed branch: ~scarlettmoore/ubuntu/+source/casper:main
Merge into: ubuntu/+source/casper:ubuntu/devel
Diff against target: 34 lines (+14/-0) (has conflicts)
2 files modified
debian/changelog (+10/-0)
scripts/casper-bottom/34disable_kde_services (+4/-0)
Conflict in debian/changelog
Conflict in scripts/casper-bottom/34disable_kde_services
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+464651@code.launchpad.net

Commit message

Emergency fix for live CD. I inadvertently turned on autolock leaving users in a broken state in a live system.

To post a comment you must log in.
~scarlettmoore/ubuntu/+source/casper:main updated
2913cd2... by Scarlett Gately Moore

Emergency fix for live CD. I inadvertently turned on autolock leaving users in a broken state in a live system.

Revision history for this message
Ken Sharp (kennybobs) wrote :

As Scarlett points out this is an emergency fix.

If you choose to "try Kubuntu" then choose to install the system, the lock screen will enable before you finish the installation, leaving the system in an unknown state and forcing the user to reboot, not knowing if the installation has completed for not.

Reply

Unmerged commits

2913cd2... by Scarlett Gately Moore

Emergency fix for live CD. I inadvertently turned on autolock leaving users in a broken state in a live system.

e6c2c6c... by Simon Quigley

Changelog fixes

ae6b1d8... by Scarlett Gately Moore

Fix 34disable_kde_services to correctly disable kscreenlocker on live cd. (LP #2054246)

c0ebc1c... by Simon Quigley

changelog

f6904d1... by Simon Quigley

Allow Xubuntu's installer to be ran without marking the executable as trusted

Xfce does trusted metadata differently; instead of simply flipping a boolean,
it expects the sha256 checksum of the .desktop file itself. Adjust accordingly.

e809e39... by Simon Quigley

Add a changelog entry and upload

d946be9... by Aaron Rainbolt

Add Ubuntu Unity's Calamares shortcut to the desktop

428a45c... by Steve Langasek

releasing package casper version 1.494

0f6116a... by Steve Langasek

changelog

ed430eb... by Aaron Rainbolt

Fix the order of sddm autologin xsession checks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6ae3760..4a341af 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,13 @@
6+<<<<<<< debian/changelog
7+=======
8+casper (1.498) noble; urgency=medium
9+
10+ * Redisable autolock in 34disable_kde-services on live.
11+ (LP: #2062402)
12+
13+ -- Scarlett Moore <sgmoore@debian.org> Thu, 18 Apr 2024 14:45:12 -0700
14+
15+>>>>>>> debian/changelog
16 casper (1.497) noble; urgency=medium
17
18 * Fix 34disable_kde_services to correctly disable
19diff --git a/scripts/casper-bottom/34disable_kde_services b/scripts/casper-bottom/34disable_kde_services
20index c400cb3..3821034 100755
21--- a/scripts/casper-bottom/34disable_kde_services
22+++ b/scripts/casper-bottom/34disable_kde_services
23@@ -23,7 +23,11 @@ log_begin_msg "$DESCRIPTION"
24 for pkg in kubuntu-default-settings ubuntustudio; do
25 settingsdir="/root/usr/share/$pkg/kf5-settings"
26 [ -d "$settingsdir" ] || continue
27+<<<<<<< scripts/casper-bottom/34disable_kde_services
28 printf "[Daemon]\nTimeout=0\nLockOnResume=false\n" >> "$settingsdir"/kscreenlockerrc
29+=======
30+ printf "[Daemon]\nTimeout=0\nAutoLock=false\nLockOnResume=false\n" >> "$settingsdir"/kscreenlockerrc
31+>>>>>>> scripts/casper-bottom/34disable_kde_services
32 printf "[Basic Settings]\nIndexing-Enabled=false\n" >> "$settingsdir"/baloofilerc
33 printf "[Module-notificationhelper]\nautoload=false\n" >> "$settingsdir"/kded5rc
34 printf "[Event/Update]\nAction=\n" >> "$settingsdir"/muonabstractnotifier.notifyrc

Subscribers

People subscribed via source and target branches