From: Paul Hänsch <paul@plutz.net>
Date: Tue, 24 Jul 2018 10:28:39 +0000 (+0200)
Subject: update files from master
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=refs%2Fheads%2Fnis;p=bootimage

update files from master
---

diff --git a/Makefile b/Makefile
index 8879c09..00c2c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ stretch_%_config/: stretch_%_root/ ${CONFIG} permissions .FORCE
 stretch_%.squashfs: stretch_%_config/
 	rm "$@" || true
 	mksquashfs "$<" "$@" -comp xz
+	chmod a+r "$@"
 
 vmlinuz: stretch_*_root/
 	ln -fs '$<$@' ./
diff --git a/config_base/etc/X11/Xresources/xscreensaver b/config_base/etc/X11/Xresources/xscreensaver
index 657bf26..6c4d7e8 100644
--- a/config_base/etc/X11/Xresources/xscreensaver
+++ b/config_base/etc/X11/Xresources/xscreensaver
@@ -1,2 +1,4 @@
 xscreensaver.mode: one
 xscreensaver.selected: 151
+xscreensaver.newLoginCommand: /usr/sbin/lxdm -c USER_SWITCH
+
diff --git a/config_base/etc/apt/preferences b/config_base/etc/apt/preferences
new file mode 100644
index 0000000..6534992
--- /dev/null
+++ b/config_base/etc/apt/preferences
@@ -0,0 +1,3 @@
+Package: *
+Pin: release n=stretch
+Pin-Priority: 900
diff --git a/config_base/etc/apt/sources.list b/config_base/etc/apt/sources.list
index 10a702f..bd5d70e 100644
--- a/config_base/etc/apt/sources.list
+++ b/config_base/etc/apt/sources.list
@@ -1,2 +1,4 @@
 deb http://deb.debian.org/debian stretch main
 deb http://security.debian.org/ stretch/updates main
+
+deb http://deb.debian.org/debian buster main
diff --git a/config_base/etc/lxdm/lxdm.conf b/config_base/etc/lxdm/lxdm.conf
new file mode 100644
index 0000000..ceb4ca6
--- /dev/null
+++ b/config_base/etc/lxdm/lxdm.conf
@@ -0,0 +1,61 @@
+[base]
+## uncomment and set autologin username to enable autologin
+# autologin=dgod
+
+## uncomment and set timeout to enable timeout autologin,
+## the value should >=5
+# timeout=10
+
+## default session or desktop used when no systemwide config
+session=/usr/bin/startxfce4
+
+## uncomment and set to set numlock on your keyboard
+# numlock=0
+
+## set this if you don't want to put xauth file at ~/.Xauthority
+# xauth_path=/tmp
+
+# not ask password for users who have empty password
+# skip_password=1
+
+## greeter used to welcome the user
+greeter=/usr/lib/lxdm/lxdm-greeter-gtk
+
+[server]
+## arg used to start xserver, not fully function
+# arg=/usr/bin/X -background vt1
+# uncomment this if you really want xserver listen to tcp
+# tcp_listen=1
+
+[display]
+## gtk theme used by greeter
+gtk_theme=Clearlooks
+
+## background of the greeter
+#bg=/usr/share/backgrounds/default.png
+bg=/usr/share/images/desktop-base/login-background.svg
+
+## if show bottom pane
+bottom_pane=1
+
+## if show language select control
+lang=1
+
+## if show keyboard layout select control
+keyboard=0
+
+## the theme of greeter
+theme=Industrial
+
+[input]
+
+[userlist]
+## if disable the user list control at greeter
+disable=0
+
+## whitelist user
+white=
+
+## blacklist user
+black=
+
diff --git a/config_base/etc/sudoers b/config_base/etc/sudoers
new file mode 100644
index 0000000..1b534c8
--- /dev/null
+++ b/config_base/etc/sudoers
@@ -0,0 +1,27 @@
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# Please consider adding local content in /etc/sudoers.d/ instead of
+# directly modifying this file.
+#
+# See the man page for details on how to write a sudoers file.
+#
+Defaults	env_reset
+Defaults	mail_badpass
+Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# User privilege specification
+root	ALL=(ALL:ALL) ALL
+
+# Allow members of group sudo to execute any command
+%sudo	ALL=NOPASSWD: ALL
+
+# See sudoers(5) for more information on "#include" directives:
+
+#includedir /etc/sudoers.d
diff --git a/permissions.mk b/permissions.mk
index 0930d2e..165f3b4 100644
--- a/permissions.mk
+++ b/permissions.mk
@@ -7,14 +7,16 @@ permissions: ${CONFIG} .FORCE
 	-chmod -R a+rX config_*/var/
 	-chmod -R a+rX config_*/lib/
 	-chmod -R a+rX config_*/usr/
+	-chmod -R a+rX config_*/opt/
 	-chmod 0700 config_*/var/lib/polkit-1/
+	-chgrp -R 107 config_*/var/spool/cron/crontabs/
+	-chmod 1730 config_*/var/spool/cron/crontabs/
+	-chmod 0600 config_*/var/spool/cron/crontabs/*
+	-chmod 0600 config_*/etc/NetworkManager/system-connections/*
 	-chmod 0750 config_*/root/
 	-chmod 0700 config_*/root/.ssh/
 	-chmod 0600 config_*/root/.ssh/authorized_keys
 	-chmod 0750 config_*/home/*/
 	-chmod 0700 config_*/home/*/.ssh/
 	-chmod 0600 config_*/home/*/.ssh/authorized_keys
-	-chgrp -R 107 config_*/var/spool/cron/crontabs/
-	-chmod 1730 config_*/var/spool/cron/crontabs/
-	-chmod 0600 config_*/var/spool/cron/crontabs/*
-	-chmod 0600 config_*/etc/NetworkManager/system-connections/*
+	-chown 1014:1014 config_*/home/guest