Import Debian version 5.20190329+parrot7

live-config (2:5.20190329+parrot7) parrot; urgency=medium

  * Minor service fixes.
  * Set up a max timeout for the systemd unit.
Signed-off-by: Lorenzo Faletra's avatarLorenzo Palinuro Faletra <palinuro@parrotsec.org>
parent 5fa14fba
......@@ -19,6 +19,7 @@ ConditionKernelCommandLine=boot=live
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/live-config
TimeoutSec=40
[Install]
WantedBy=basic.target
......@@ -67,7 +67,7 @@ Config ()
# Default password is: live
# passwords can be generated with 'echo "live" | mkpasswd -s',
# a blank password is 'U6aMy0wojraho'.
_PASSWORD="vPHiq9cf18U2U"
_PASSWORD="ZfwEsA2L9T2VI"
cat > /tmp/live-config.cfg << EOF
live-debconfig live-debconfig/passwd/shadow boolean on
......
......@@ -67,7 +67,7 @@ Config ()
# Default password is: live
# passwords can be generated with 'echo "live" | mkpasswd -s',
# a blank password is 'U6aMy0wojraho'.
_PASSWORD="vPHiq9cf18U2U"
_PASSWORD="ZfwEsA2L9T2VI"
cat > /tmp/live-config.cfg << EOF
user-setup passwd/make-user boolean true
......
live-config (2:5.20190329+parrot7) parrot; urgency=medium
* Minor service fixes.
* Set up a max timeout for the systemd unit.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Sun, 07 Apr 2019 01:55:59 +0200
live-config (5.20190329+parrot6) testing; urgency=medium
* Remove firejail hooks.
......
......@@ -4,7 +4,7 @@
LIVE_HOSTNAME="parrot"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Parrot Live user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo libvirt fuse dialout"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
export LIVE_HOSTNAME LIVE_USERNAME LIVE_USER_FULLNAME LIVE_USER_DEFAULT_GROUPS
# Reading configuration files from filesystem and live-media
......
......@@ -23,22 +23,35 @@ _RELEASE="${3:-$(lsb_release -cs | tr [A-Z] [a-z])}"
if ( [ -z "${_DISTRIBUTION}" ] || [ -z "${_RELEASE}" ] ) && [ ! -x "$(which lsb_release 2>/dev/null)" ]
then
echo "E: lsb_release: command not found."
echo "W: lsb_release: command not found."
echo "I: lsb_release can be obtained from:"
echo "I: http://www.linux-foundation.org/en/LSB"
echo "I: On Debian based systems, lsb_release can be installed with:"
echo "I: sudo apt-get install lsb-release"
exit 1
echo
echo "Obtaining distro info by manually reading /etc/lsb-release"
_DISTRIBUTION="${2:-$(cat /etc/lsb-release | grep DISTRIB_ID | sed -e "s/DISTRIB_ID=//" | tr [A-Z] [a-z] | sed -e 's| |-|g')}"
fi
case "${_DISTRIBUTION}" in
debian)
NOCOMPONENT="apport"
LIVE_HOSTNAME="debian"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Debian Live user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
PROC_OPTIONS="onodev,noexec,nosuid"
;;
parrot)
NOCOMPONENT="apport"
LIVE_HOSTNAME="parrot"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Parrot Live user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo libvirt fuse dialout"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
PROC_OPTIONS="onodev,noexec,nosuid"
;;
......@@ -49,7 +62,7 @@ case "${_DISTRIBUTION}" in
LIVE_HOSTNAME="system"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Parrot user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo libvirt fuse dialout"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
PROC_OPTIONS="onodev,noexec,nosuid,hidepid=2"
;;
......
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