Improved NoDM, removed swap file
Fixed NoDM configuration file, now dynamically generates instead of copying a file. Removed swap file because this shreds through MicroSDs and isn't needed either.
This commit is contained in:
parent
5c72a8acf9
commit
99c4fbb46d
4 changed files with 36 additions and 16 deletions
|
@ -30,7 +30,6 @@ usbutils
|
||||||
libraspberrypi-dev
|
libraspberrypi-dev
|
||||||
libfreetype6-dev
|
libfreetype6-dev
|
||||||
dosfstools
|
dosfstools
|
||||||
dphys-swapfile
|
|
||||||
raspberrypi-sys-mods
|
raspberrypi-sys-mods
|
||||||
pi-bluetooth
|
pi-bluetooth
|
||||||
apt-listchanges
|
apt-listchanges
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
Index: jessie-stage2/rootfs/etc/dphys-swapfile
|
|
||||||
===================================================================
|
|
||||||
--- jessie-stage2.orig/rootfs/etc/dphys-swapfile
|
|
||||||
+++ jessie-stage2/rootfs/etc/dphys-swapfile
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
|
|
||||||
# set size to absolute value, leaving empty (default) then uses computed value
|
|
||||||
# you most likely don't want this, unless you have an special disk situation
|
|
||||||
-#CONF_SWAPSIZE=
|
|
||||||
+CONF_SWAPSIZE=100
|
|
||||||
|
|
||||||
# set size to computed value, this times RAM size, dynamically adapts,
|
|
||||||
# guarantees that there is enough swap without wasting disk space on excess
|
|
|
@ -1,5 +1,4 @@
|
||||||
01-useradd.diff
|
01-useradd.diff
|
||||||
02-swap.diff
|
|
||||||
04-inputrc.diff
|
04-inputrc.diff
|
||||||
05-path.diff
|
05-path.diff
|
||||||
07-resize-init.diff
|
07-resize-init.diff
|
||||||
|
|
|
@ -1,6 +1,41 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
|
|
||||||
echo -n -e "NODM_USER=${FIRST_USER_NAME}\nNODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile" > ${ROOTFS_DIR}/etc/nodm.conf
|
#echo -n -e "NODM_USER=${FIRST_USER_NAME}\nNODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile" > ${ROOTFS_DIR}/etc/nodm.conf
|
||||||
|
|
||||||
|
cat > /etc/default/nodm << 'EOF'
|
||||||
|
# nodm configuration
|
||||||
|
|
||||||
|
# Set NODM_ENABLED to something different than 'false' to enable nodm
|
||||||
|
NODM_ENABLED=true
|
||||||
|
|
||||||
|
# User to autologin for
|
||||||
|
NODM_USER=${FIRST_USER_NAME}
|
||||||
|
|
||||||
|
# First vt to try when looking for free VTs
|
||||||
|
NODM_FIRST_VT=7
|
||||||
|
|
||||||
|
# X session
|
||||||
|
NODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile
|
||||||
|
|
||||||
|
# Options for nodm itself
|
||||||
|
NODM_OPTIONS=
|
||||||
|
|
||||||
|
# Options for the X server.
|
||||||
|
#
|
||||||
|
# Format: [/usr/bin/<Xserver>] [:<disp>] <Xserver-options>
|
||||||
|
#
|
||||||
|
# The Xserver executable and the display name can be omitted, but should
|
||||||
|
# be placed in front, if nodm's defaults shall be overridden.
|
||||||
|
NODM_X_OPTIONS='-nolisten tcp'
|
||||||
|
|
||||||
|
# If an X session will run for less than this time in seconds, nodm will wait an
|
||||||
|
# increasing bit of time before restarting the session.
|
||||||
|
NODM_MIN_SESSION_TIME=60
|
||||||
|
|
||||||
|
# Timeout (in seconds) to wait for X to be ready to accept connections. If X is
|
||||||
|
# not ready before this timeout, it is killed and restarted.
|
||||||
|
NODM_X_TIMEOUT=300
|
||||||
|
EOF
|
||||||
|
|
||||||
on_chroot << EOF
|
on_chroot << EOF
|
||||||
update-alternatives --install /usr/bin/x-www-browser \
|
update-alternatives --install /usr/bin/x-www-browser \
|
||||||
|
|
Loading…
Reference in a new issue