QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tag for commit fe6b1be0db

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVPuCwAAoJEBu5sftaTG2tUd8P/jLC8sbQJS7qe56NB/ERLOL4
 w4ZRg51lukFT+y0TKABt4agsAwN9ee3kz5AGv2Yl9EDPoEAIRt/XLA6WmQUKrubU
 +SwFhu0guhAFY8zcZY6MZoDnUUEpnMfwjb/5ExkQg5to1WKWhB7nbAPN4m/i0onN
 nzSKQgWGgyXed0v6QvvZXJDhAfjTY0q0XOxAQEYzNAGm3AZmkruccIOQJ3HRAJ5k
 W9GG0Wg2q4UOhbbp3JNqvUIjAi8SqX6kQspkMUK2JeTUf2LN+EeDj6ggkSm9nBRI
 qGvDCTc6tHY9nuOQ/URElLXEFULDo+OQ6B57AtH69HAW2hCd9ZE00hmYejnPYsH5
 iu9R6SE6YEHTeOokK5shmZtuo68lu3LJJRYueGarzkPws4rwwW4CwVhRQEJugb9x
 10RR6FAlyBTwjOMdfq6G/YtAWZX+vH+Kx9zF+N2egP1896FGR25FfsRAi9GJ186Q
 SWvY4eUTkLB4XaxmnJneGFRLquR+XnoOR/XjF/Xae/CH0M2efNiIB8PpjlehU4v/
 zeNwQiyBjrHBjxD89O0VkdkbnntAiPKYXcKEzwD1A+OSTcR6XLPXLlFr0qoy7akg
 T1VOs5RfO6SEgqk4oVIc4/wDmMzsskDopRHjWpZyR9jddGI3HZq0KrjFJ0FHrecl
 8p0U1Iq3GytHGAvaDCNj
 =BGpk
 -----END PGP SIGNATURE-----

Merge tag 'jm_fe6b1be0'

Tag for commit fe6b1be0db

# gpg: Signature made Tue 28 Apr 2015 03:21:52 AM CEST using RSA key ID 5A4C6DAD
# gpg: Can't check signature: public key not found

* tag 'jm_fe6b1be0':
  Allow appmenus to be located using APPMENUS_DIR ENV variable
  SYSTEMD_NSPAWN_ENABLE was missing from chroot if VERBOSE was < 2
This commit is contained in:
Marek Marczykowski-Górecki 2015-05-03 01:39:47 +02:00
commit 93268b6548
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
functions.sh
View File

@ -81,19 +81,28 @@ fi
if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
chroot() { chroot() {
# Display `chroot` or `systemd-nspawn` in blue ONLY if VERBOSE >= 2
# or DEBUG == "1"
local retval local retval
true ${blue} true ${blue}
# Need to capture exit code after running chroot or systemd-nspawn
# so it will be available as a return value
if [ "${SYSTEMD_NSPAWN_ENABLE}" == "1" ]; then if [ "${SYSTEMD_NSPAWN_ENABLE}" == "1" ]; then
systemd-nspawn $systemd_bind -D "${INSTALLDIR}" -M "${DIST}" "$@" && { retval=$?; true; } || { retval=$?; true; } systemd-nspawn $systemd_bind -D "${INSTALLDIR}" -M "${DIST}" ${1+"$@"} && { retval=$?; true; } || { retval=$?; true; }
else else
/usr/sbin/chroot "${INSTALLDIR}" "$@" && { retval=$?; true; } || { retval=$?; true; } /usr/sbin/chroot "${INSTALLDIR}" ${1+"$@"} && { retval=$?; true; } || { retval=$?; true; }
fi fi
true ${reset} true ${reset}
return $retval return $retval
} }
else else
chroot() { chroot() {
/usr/sbin/chroot "${INSTALLDIR}" "$@" if [ "${SYSTEMD_NSPAWN_ENABLE}" == "1" ]; then
systemd-nspawn $systemd_bind -D "${INSTALLDIR}" -M "${DIST}" ${1+"$@"}
else
/usr/sbin/chroot "${INSTALLDIR}" ${1+"$@"}
fi
} }
fi fi

13
qubeize_image
View File

@ -77,13 +77,14 @@ export INSTALLDIR=mnt
# Create App Menus # Create App Menus
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
echo "--> Choosing appmenus whitelists..." echo "--> Choosing appmenus whitelists..."
_appmenus_dir="${APPMENUS_DIR-${SCRIPTSDIR}}"
rm -f appmenus rm -f appmenus
if [ -d "${SCRIPTSDIR}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then if [ -d "${_appmenus_dir}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then
ln -s "${SCRIPTSDIR}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus ln -s "${_appmenus_dir}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus
elif [ -d "${SCRIPTSDIR}/appmenus_$DIST" ]; then elif [ -d "${_appmenus_dir}/appmenus_$DIST" ]; then
ln -s "${SCRIPTSDIR}/appmenus_$DIST" appmenus ln -s "${_appmenus_dir}/appmenus_$DIST" appmenus
elif [ -d "${SCRIPTSDIR}/appmenus" ]; then elif [ -d "${_appmenus_dir}/appmenus" ]; then
ln -s "${SCRIPTSDIR}/appmenus" appmenus ln -s "${_appmenus_dir}/appmenus" appmenus
else else
ln -s "appmenus_generic" appmenus ln -s "appmenus_generic" appmenus
fi fi