Merge remote-tracking branch 'fai-config/master' into nfsroot

faiproject · Aug 7, 2024 · c0e0bfa · c0e0bfa
2 parents a9ca3d7 + 50d678c
commit c0e0bfa
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/basefiles/mk-basefile b/basefiles/mk-basefile
@@ -217,7 +217,7 @@ debgeneric() {
     fi
 
     if [ -n "$arch" ]; then
-	qemu-debootstrap --arch $arch ${exc} $inc $dist $xtmp $mirror
+	debootstrap --arch $arch ${exc} $inc $dist $xtmp $mirror
 	target="${target}_${arch^^}"
     else
 	if [[ $DIST =~ 64 ]]; then

diff --git a/class/10-base-classes b/class/10-base-classes
@@ -5,8 +5,7 @@ if [ X$FAI_ACTION = Xinstall -a $do_init_tasks -eq 0 ]; then
     exit 0
 fi
 
-# Echo architecture and OS name in uppercase. Do NOT remove these two lines.
-uname -s | tr '[:lower:]' '[:upper:]'
+# Echo architecture
 command -v dpkg >&/dev/null && dpkg --print-architecture | tr a-z A-Z
 
 # determin if we are a DHCP client or not

diff --git a/class/50-host-classes b/class/50-host-classes
@@ -16,7 +16,7 @@ case $HOSTNAME in
     gnomehost)
         echo "FAIBASE DEBIAN DEMO XORG GNOME";;
     ubuntuhost)
-        echo "FAIBASE DEBIAN DEMO UBUNTU JAMMY JAMMY64 XORG";;
+        echo "FAIBASE DEBIAN DEMO UBUNTU NOBLE NOBLE64 XORG";;
     rocky)
         echo "FAIBASE ROCKY"   # you may want to add class XORG here
         ifclass AMD64 && echo ROCKY9_64

diff --git a/class/DEBIAN.var b/class/DEBIAN.var
@@ -35,7 +35,7 @@ elif ifclass AMD64; then
    kernelname=linux-image-amd64
 fi
 
-if [ -z "kernelname" ]; then
+if [ -z "$kernelname" ]; then
     _arch=$(dpkg --print-architecture 2>/dev/null)
     case $_arch in
         i386)

diff --git a/class/UBUNTU.var b/class/UBUNTU.var
@@ -1,2 +1,2 @@
 ubuntumirror=http://archive.ubuntu.com
-ubuntudist=jammy
+ubuntudist=noble
diff --git a/class/example.profile b/class/example.profile
@@ -34,12 +34,12 @@ downloaded from the internet.
 Classes: INSTALL FAIBASE ROCKY ROCKY9_64 XORG
 
 Name: Ubuntu
-Description: Ubuntu 22.04 LTS desktop installation
+Description: Ubuntu 24.04 LTS desktop installation
 Short: Unity desktop
 Long: We use the Debian nfsroot for installing the Ubuntu OS.
 You should have a fast network connection, because most packages are
 downloaded from the internet.
-Classes: INSTALL FAIBASE DEMO DEBIAN UBUNTU JAMMY JAMMY64 XORG
+Classes: INSTALL FAIBASE DEMO DEBIAN UBUNTU NOBLE NOBLE64 XORG
 
 Name: Inventory
 Description: Show hardware info

diff --git a/files/etc/rc.local/CLOUD b/files/etc/rc.local/CLOUD
@@ -4,5 +4,7 @@
 ls /etc/ssh/ssh_host_* >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     dpkg-reconfigure -fnoninteractive openssh-server
+    systemctl reset-failed ssh
+    systemctl restart ssh
 fi
 rm $0
diff --git a/hooks/savelog.LAST.sh b/hooks/savelog.LAST.sh
@@ -184,6 +184,7 @@ subprocess.py.\+RuntimeWarning: line buffering
 Resource conflict.\+ found
 os-prober will not be executed
 /sys/bus/usb/devices/\*:\*/bInterface
+_OSC evaluation for CPU failed, trying
 update-rc.d: warning: start and stop actions are no longer supported"
 
 # add pattern on some conditions

diff --git a/package_config/DEBIAN b/package_config/DEBIAN
@@ -38,8 +38,7 @@ PACKAGES install-norec I386 AMD64
 memtest86+
 
 PACKAGES install-norec CHROOT
-linux-image-686-pae-
-linux-image-amd64-
+${kernelname}- # see class/DEBIAN.var
 
 PACKAGES install-norec AMD64
 ${kernelname} # see class/DEBIAN.var

diff --git a/package_config/STANDARD b/package_config/STANDARD
@@ -16,7 +16,7 @@ locales
 lsof
 man-db
 manpages
-mime-support
+media-types
 ncurses-term
 netcat-traditional
 openssh-client