CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

casper: remove user interaction requirement on shutdown/reboot.

Browse source
This commit is contained in:
Luis Guzmán 2025-12-25 21:33:23 -06:00
parent 29148e31a5
commit d27d3c5e9b
2 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

45
helpers/DATA/casper/patch_changes/003-reenable_checksum_plymuouth.patch → helpers/DATA/casper/patch_changes/003-reenable_checksum_plymouth.patch
View file

@ -8,7 +8,7 @@ index a1e4f753..5213fd3d 100644
+/* Show a human-friendly percent message every N percent points. +/* Show a human-friendly percent message every N percent points.
+ * Script themes like trisquel-logo display messages but ignore fsck: status updates. */ + * Script themes like trisquel-logo display messages but ignore fsck: status updates. */
+#define PLYMOUTH_PERCENT_STEP 5 +#define PLYMOUTH_PERCENT_STEP 1
+ +
#define RESULT_FILE "/run/casper-md5check.json" #define RESULT_FILE "/run/casper-md5check.json"
#define BROKEN_FILE " \"checksum_missmatch\": [ " #define BROKEN_FILE " \"checksum_missmatch\": [ "
@ -101,10 +101,10 @@ index a1e4f753..5213fd3d 100644
return 0; return 0;
} }
diff --git a/debian/casper.casper-md5check.service b/debian/casper.casper-md5check.service_ diff --git a/debian/casper.casper-md5check.service b/debian/casper.casper-md5check.service
index 0af66ec2..6a5860fa 100644 index 0af66ec2..6a5860fa 100644
--- a/debian/casper.casper-md5check.service --- a/debian/casper.casper-md5check.service
+++ b/debian/casper.casper-md5check.service_ +++ b/debian/casper.casper-md5check.service
@@ -1,12 +1,26 @@ @@ -1,12 +1,26 @@
[Unit] [Unit]
Description=casper-md5check Verify Live ISO checksums Description=casper-md5check Verify Live ISO checksums
@ -134,3 +134,42 @@ index 0af66ec2..6a5860fa 100644
IOSchedulingClass=idle IOSchedulingClass=idle
IOSchedulingPriority=7 IOSchedulingPriority=7
diff --git a/bin/casper-stop b/bin/casper-stop
index 56174681..5fab7c36 100755
--- a/bin/casper-stop
+++ b/bin/casper-stop
@@ -100,31 +100,9 @@ do_stop ()
return 0
fi
- # XXX - i18n
- MSG="Please remove the installation medium, then press ENTER: "
- MSG_FALLBACK="Please remove the installation medium, then reboot."
-
- if [ "$prompt" ]; then
- if [ -x /bin/plymouth ] && plymouth --ping; then
- chvt 63
- plymouth message --text="$MSG"
- clear > /dev/tty1
- echo $MSG_FALLBACK > /dev/tty1
- else
- stty sane < /dev/console
- echo $MSG > /dev/console
- fi
- fi
-
- eject -p -m $device >/dev/null 2>&1
-
- [ "$prompt" ] || return 0
-
- if [ -x /bin/plymouth ] && plymouth --ping; then
- plymouth watch-keystroke > /dev/null
- else
- read x < /dev/console
- fi
+ # Trisquel: We no longer block shutdown/reboot waiting for user input.
+ eject -p -m "$device" >/dev/null 2>&1 || true
+ return 0
}
do_stop

2
helpers/make-casper
View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=27 VERSION=28
. ./config . ./config