Set version to 26.1; VesperOS fork of Debian base-files

debian/base-files.dirs

@@ -1,7 +1,6 @@
 boot
 dev
 etc
-etc/default
 etc/dpkg/origins
 etc/profile.d
 etc/skel

debian/control

@@ -10,7 +10,7 @@ Rules-Requires-Root: no
 
 Package: base-files
 Provides: base, usr-is-merged
-Architecture: any
+Architecture: all
 Pre-Depends: awk
 Depends: ${misc:Depends}
 Essential: yes

debian/postinst

@@ -130,4 +130,14 @@ if [ "$1" = "configure" ] || [ "$1" = "triggered" ]; then
   done
 fi
 
+# Set zsh as the default shell for new users
+if [ "$1" = "configure" ]; then
+  if [ -f "$DPKG_ROOT/etc/default/useradd" ]; then
+    sed -i 's|^SHELL=.*|SHELL=/bin/zsh|' "$DPKG_ROOT/etc/default/useradd"
+  fi
+  if [ -f "$DPKG_ROOT/etc/adduser.conf" ]; then
+    sed -i 's|^DSHELL=.*|DSHELL=/bin/zsh|' "$DPKG_ROOT/etc/adduser.conf"
+  fi
+fi
+
 #DEBHELPER#

debian/rules

@@ -45,8 +45,7 @@ execute_after_dh_installdirs:
 	dh_installdirs $(foreach d,$(USR_MERGE),usr/$(d))
 
 override_dh_auto_install:
-	install -p -m 644 etc/host.conf etc/issue etc/issue.net etc/os-release etc/vesper_version etc/adduser.conf $(DESTDIR)/etc
-	install -p -m 644 etc/default/useradd $(DESTDIR)/etc/default
+	install -p -m 644 etc/host.conf etc/issue etc/issue.net etc/os-release etc/vesper_version $(DESTDIR)/etc
 	install -p -m 755 motd/*          $(DESTDIR)/etc/update-motd.d
 	install -p -m 644 licenses/* $(DESTDIR)/usr/share/common-licenses
 	install -p -m 644 origins/*  $(DESTDIR)/etc/dpkg/origins

etc/adduser.conf

@@ -1,24 +0,0 @@
-# /etc/adduser.conf - configuration file for adduser(8) and addgroup(8)
-DSHELL=/bin/zsh
-DHOME=/home
-GROUPHOMES=no
-LETTERHOMES=no
-SKEL=/etc/skel
-SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
-FIRST_SYSTEM_UID=100
-LAST_SYSTEM_UID=999
-FIRST_SYSTEM_GID=100
-LAST_SYSTEM_GID=999
-FIRST_UID=1000
-LAST_UID=59999
-FIRST_GID=1000
-LAST_GID=59999
-USERGROUPS=yes
-USERS_GID=100
-DIR_MODE=0755
-SETGID_HOME=no
-QUOTAUSER=""
-NAME_REGEX="^[a-z][-a-z0-9_]*\$"
-SYSNAME_REGEX="^[a-z_][-a-z0-9_]*\$"
-ADD_EXTRA_GROUPS=0
-EXTRA_GROUPS=""

etc/default/useradd

@@ -1,8 +0,0 @@
-# Default values for useradd(8)
-SHELL=/bin/zsh
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no