set sudo group earlier to be safe

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 4e25d97cf4e3b489ff1a3c8b09136611c943017c..b248bd31e7759b17a96c77ae1f33bee83db94c81 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -80,6 +80,10 @@ echo "fs.inotify.max_user_watches = 50000" >> $f
 # applies it. it would be also be applied after a reboot
 $ROOTCMD sysctl --system
 
+if getent group sudo >/dev/null; then
+  usermod -aG sudo iank
+fi
+
 cat >$target/etc/sudoers.d/ianksudoers <<'EOF'
 Defaults timestamp_timeout=1440
 # used in bashrc

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index e27260e76065f0c77c02b71a8e8a8647bde33686..93df65558234e1a2537ec50ea83009817228f5a2 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -379,7 +379,7 @@ f=/etc/ssh/sshd_config
 grep -xFq "$line" $f || tee -a $f <<<"$line"
 
 
-# default debian groups (jessie through buster) + adm, sudo, root, admin
+# default debian groups (jessie through buster) + adm, root, admin
 for g in cdrom floppy audio dip video plugdev netdev adm sudo admin; do
   if getent group $g >/dev/null; then
     usermod -aG $g iank