Commit cfe52905 authored by Lorenzo Faletra's avatar Lorenzo Faletra

Import Debian version 5.20190329+parrot8

live-config (2:5.20190329+parrot8) testing; urgency=medium

  * Remve live-debconfig scripts.
  * Make systemd timeout shorter for debug.
  * Make service depend on haveged for RNG generation.
parent 6df62656
......@@ -7,10 +7,10 @@
[Unit]
Description=live-config contains the components that configure a live system during the boot process (late userspace).
Description=live-config configures a live system during the boot process (late userspace).
Documentation=man:live-config
Before=basic.target
After=local-fs.target systemd-tmpfiles-setup.service
After=local-fs.target systemd-tmpfiles-setup.service haveged.service
DefaultDependencies=no
ConditionPathExists=/bin/live-config
ConditionKernelCommandLine=boot=live
......@@ -19,7 +19,7 @@ ConditionKernelCommandLine=boot=live
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/live-config
TimeoutSec=40
TimeoutSec=20
[Install]
WantedBy=basic.target
#!/bin/sh
## live-config(7) - System Configuration Components
## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
#set -e
Cmdline ()
{
# Reading kernel command line
for _PARAMETER in ${LIVE_CONFIG_CMDLINE}
do
case "${_PARAMETER}" in
live-config.user-default-groups=*|user-default-groups=*)
LIVE_USER_DEFAULT_GROUPS="${_PARAMETER#*user-default-groups=}"
;;
live-config.user-fullname=*|user-fullname=*)
LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}"
;;
live-config.username=*|username=*)
LIVE_USERNAME="${_PARAMETER#*username=}"
;;
esac
done
}
Init ()
{
# Checking if package is installed or already configured
if [ ! -e /var/lib/dpkg/info/live-debconfig.list ] || \
[ -e /var/lib/live/config/live-debconfig_passwd ]
then
exit 0
fi
echo -n " live-debconfig (passwd)"
}
Config ()
{
# Checking if package is already configured differently
if grep -q "^${LIVE_USERNAME}:" /etc/passwd
then
exit 0
fi
# Adjust formating of groups
if [ -n "${LIVE_USER_DEFAULT_GROUPS}" ]
then
LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|,| |g')"
fi
# Make sure user is not in sudo group if sudo is disabled
case "${LIVE_CONFIG_NOROOT}" in
true)
LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')"
;;
esac
# Default password is: live
# passwords can be generated with 'echo "live" | mkpasswd -s',
# a blank password is 'U6aMy0wojraho'.
_PASSWORD="ZfwEsA2L9T2VI"
cat > /tmp/live-config.cfg << EOF
live-debconfig live-debconfig/passwd/shadow boolean on
#live-debconfig live-debconfig/passwd/root-password password
#live-debconfig live-debconfig/passwd/root-password-again password
live-debconfig live-debconfig/passwd/root-password-crypted string *
live-debconfig live-debconfig/passwd/user-name string ${LIVE_USERNAME}
live-debconfig live-debconfig/passwd/user-fullname string ${LIVE_USER_FULLNAME}
#live-debconfig live-debconfig/passwd/user-password password
#live-debconfig live-debconfig/passwd/user-password-again password
live-debconfig live-debconfig/passwd/user-password-crypted string ${_PASSWORD}
live-debconfig live-debconfig/passwd/user-home string /home/user
live-debconfig live-debconfig/passwd/user-uid string 1000
live-debconfig live-debconfig/passwd/user-gid string 1000
live-debconfig live-debconfig/passwd/user-default-groups string ${LIVE_USER_DEFAULT_GROUPS}
live-debconfig live-debconfig/passwd/user-system-user boolean false
EOF
live-debconfig-set-selections /tmp/live-config.cfg
rm -f /tmp/live-config.cfg
live-debconfig --debconfig=passwd
# Creating state file
touch /var/lib/live/config/live-debconfig_passwd
}
Cmdline
Init
Config
live-config (2:5.20190329+parrot8) testing; urgency=medium
* Remve live-debconfig scripts.
* Make systemd timeout shorter for debug.
* Make service depend on haveged for RNG generation.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Mon, 08 Apr 2019 11:44:03 +0200
live-config (2:5.20190329+parrot7) parrot; urgency=medium
* Minor service fixes.
......
......@@ -22,7 +22,8 @@ Recommends: iproute2 | iproute,
live-tools,
locales | locales-all,
sudo,
user-setup
user-setup,
debconf
Suggests: pciutils,
wget
Description: Live System Configuration Components
......
......@@ -20,8 +20,7 @@ override_dh_auto_install:
rm -f debian/tmp/live/config/*live-debconfig*
# Removing unused files
rm -f debian/tmp/usr/share/doc/live-config/COPYING
frontend/live-config-update debian/tmp
rm -f debian/tmp/usr/share/doc/live-config/COPYING debian/tmp
override_dh_compress:
dh_compress -Xusr/share/doc/live-config/examples
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment