[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: cf3/: Support recognizing FAI based installations of Debian Edu systems (except from main server).

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
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

- - - - -


4 changed files:

- cf3/cf.finalize
- cf3/cf.grub
- cf3/edu.cf
- debian/changelog


Changes:

=====================================
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,3 +1,14 @@
+debian-edu-config (2.12.904) unstable; urgency=medium
+
+  * 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 15:22:48 +0200
+
 debian-edu-config (2.12.903) unstable; urgency=medium
 
   * etc/apache2/sites-available/debian-edu-default.conf: Use SERVER_ADDRESS in



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/ecbbcc5722a54e0cb3c30d35dfe1bb811ca20942...4c259cd24f4e87c12e3f0fa6cdbdf3261235f003

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/ecbbcc5722a54e0cb3c30d35dfe1bb811ca20942...4c259cd24f4e87c12e3f0fa6cdbdf3261235f003
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/20250915/3265d1b0/attachment-0001.htm>