[debian-edu-commits] [Git][debian-edu/debian-edu-config][trixie] 5 commits: share/glib-2.0/schemas/32-debian-edu.arctica-greeter.gschema.override: Drop...
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Tue Sep 16 09:32:34 BST 2025
Mike Gabriel pushed to branch trixie at Debian Edu / debian-edu-config
Commits:
ecbbcc57 by Mike Gabriel at 2025-09-15T13:45:00+02:00
share/glib-2.0/schemas/32-debian-edu.arctica-greeter.gschema.override: Drop file. This setting is theme-specific and should be shipped in debian-edu-artwork-<THEME> if diverting from system defaults.
Also, it seems that this file was inert all the time due to wrong file naming (<nn>-<description>.gschema.override instead of <nn>_<description>.gschema.override).
- - - - -
8dbb5ef0 by Mike Gabriel at 2025-09-15T15:23:31+02:00
cf3/: Support recognizing FAI based installations of Debian Edu systems (except from main server).
- - - - -
4c259cd2 by Mike Gabriel at 2025-09-15T15:24:23+02:00
release 2.12.904
- - - - -
d47990ca by Mike Gabriel at 2025-09-15T15:27:39+02:00
Merge tag '2.12.904' into trixie
released as 2.12.904
- - - - -
8b11587e by Mike Gabriel at 2025-09-16T10:32:10+02:00
sbin/debian-edu-fsautoresize: Avoid division by zero error on unused mountpoints.
- - - - -
7 changed files:
- Makefile
- cf3/cf.finalize
- cf3/cf.grub
- cf3/edu.cf
- debian/changelog
- sbin/debian-edu-fsautoresize
- − share/glib-2.0/schemas/32-debian-edu.arctica-greeter.gschema.override
Changes:
=====================================
Makefile
=====================================
@@ -387,7 +387,6 @@ install: install-testsuite
share/firefox-esr/distribution/policies.json \
share/glib-2.0/schemas/21_debian-edu+gdm.gschema.override \
share/glib-2.0/schemas/31_debian-edu+mate.gschema.override \
- share/glib-2.0/schemas/32-debian-edu.arctica-greeter.gschema.override \
share/mate-panel/layouts/debian-edu-mate.layout \
; do \
$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
=====================================
cf3/cf.finalize
=====================================
@@ -111,7 +111,7 @@ commands:
# used during an installation with Main server or LTSP server profile to avoid
# broken network setup.
- debian.(server|ltspserver).lxqt.di.installation::
+ debian.(server|ltspserver).lxqt.(di|fai).installation::
"/usr/bin/apt-get purge -y connman"
contain => in_shell;
=====================================
cf3/cf.grub
=====================================
@@ -7,24 +7,24 @@ bundle agent grub
files:
- debian.(standalone|roaming).di.installation::
+ debian.(standalone|roaming).(di|fai).installation::
"/etc/default/grub"
edit_line => grub_conf1;
- debian.workstation.!server.!standalone.!roaming.di.installation::
+ debian.workstation.!server.!standalone.!roaming.(di|fai).installation::
"/etc/default/grub"
edit_line => grub_conf2;
- debian.(server|minimal).di.installation::
+ debian.(server|minimal).(di|fai).installation::
"/etc/default/grub"
edit_line => grub_conf3;
commands:
- debian.di.installation::
+ debian.(di|fai).installation::
"/usr/sbin/update-grub"
contain => in_shell;
=====================================
cf3/edu.cf
=====================================
@@ -31,7 +31,9 @@ bundle common edu
# Set if the Squid cache exists; used to conditionally link Debian Edu configuration.
"squidcache" expression => isdir("/var/spool/squid");
# Set if running inside Debian Installer; used to avoid useless LDAP setup upon main server upgrade.
- "di" expression => fileexists("/etc/apt/apt.conf.d/00IgnoreTimeConflict");
+ "di" expression => fileexists("/etc/apt/apt.conf.d/00IgnoreTimeConflict");
+ # Set if running inside FAI Installer; used to setup grub correctly
+ "fai" expression => isdir("/var/lib/fai/config");
# Set for networked workstation if the 'education-desktop-other' package is installed.
"desktopintern" and => { isdir("/usr/share/doc/education-desktop-other"), isdir("/usr/share/doc/education-networked") };
# Set if xfce4 is installed; used to conditionally configure settings.
=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
-debian-edu-config (2.12.903~deb13u1) trixie; urgency=medium
+debian-edu-config (2.12.904) unstable; urgency=medium
- * Upload to trixie.
+ * share/glib-2.0/schemas/32-debian-edu.arctica-greeter.gschema.override:
+ + Drop file. This setting is theme-specific and should be shipped in
+ debian-edu-artwork-<THEME> if diverting from system defaults.
+ * cf3/:
+ + Support recognizing FAI based installations of Debian Edu systems (except
+ from main server).
- -- Mike Gabriel <sunweaver at debian.org> Mon, 15 Sep 2025 09:09:50 +0200
+ -- Mike Gabriel <sunweaver at debian.org> Mon, 15 Sep 2025 15:22:48 +0200
debian-edu-config (2.12.903) unstable; urgency=medium
=====================================
sbin/debian-edu-fsautoresize
=====================================
@@ -226,7 +226,7 @@ sub supported_mountpoints {
$size = $volsizeblocks/2;
}
- my $fracavail = 100 * $avail / $size;
+ my $fracavail = 100 * $avail / ( $size + 1 );
print STDERR " A: $size $used $avail ($fracavail%)\n" if $opts{v};
my %minfo =
(
=====================================
share/glib-2.0/schemas/32-debian-edu.arctica-greeter.gschema.override deleted
=====================================
@@ -1,2 +0,0 @@
-[org.ArcticaProject.arctica-greeter]
-logo=''
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/c05d5caf8b031605ffadd532475885768b21195f...8b11587ea744239a50c64f7d56684ff75214c006
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/c05d5caf8b031605ffadd532475885768b21195f...8b11587ea744239a50c64f7d56684ff75214c006
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20250916/b1efeba3/attachment-0001.htm>
More information about the debian-edu-commits
mailing list