diff options
| author | P. J. McDermott <pj@pehjota.net> | 2016-03-06 12:56:45 (EST) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2016-03-06 12:56:45 (EST) |
| commit | 6d6acb974269e0e56ca9998c8368a21a8a65bca6 (patch) | |
| tree | fa6760c29bffda1db2e638af86c20c552295d68b | |
| parent | 7b56a625d6a786ffcb65ae433e5cb3328e95e405 (diff) | |
| download | pc-inst-6d6acb974269e0e56ca9998c8368a21a8a65bca6.zip pc-inst-6d6acb974269e0e56ca9998c8368a21a8a65bca6.tar.gz pc-inst-6d6acb974269e0e56ca9998c8368a21a8a65bca6.tar.bz2 | |
Write postinst output to log
Also move some groups to postinst.
| -rw-r--r-- | hosts/alsvid200 | 8 | ||||
| -rwxr-xr-x | inst | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/hosts/alsvid200 b/hosts/alsvid200 index 7044e74..6a19362 100644 --- a/hosts/alsvid200 +++ b/hosts/alsvid200 @@ -30,7 +30,7 @@ root_login=true user_make=true user_name='pj' user_full_name='P. J. McDermott' -user_groups='adm cdrom floppy sudo audio dip video plugdev netdev bluetooth powerdev scanner sbuild wireshark' +user_groups='adm cdrom floppy sudo audio dip video plugdev netdev' user_passwd_crypted='$6$.4kiiaCvfP$WZtL6RXtWtW0lIRnx2GyJwaN1OdkQUEHOulzxyXlS.dKTClhaI9Hkq3.bdE6TC613VqgEekwPgm3.T1D9CCuk0' postinst_pkgs=' @@ -78,7 +78,7 @@ postinst_pkgs=' starman bsdgames fortune-mod fortunes-min fortunes-bofh-excuses ' -postinst() +do_postinst() { cat >"${target}/etc/apt/sources.list.d/jessie-backports.list" <<-EOF deb http://httpredir.debian.org/debian jessie-backports main @@ -87,5 +87,9 @@ postinst() in_target apt-get update || return 1 in_target apt-get -q -y install midori || return 1 + in_target adduser pj scanner + in_target adduser pj wireshark + in_target adduser pj sbuild + return 0 } @@ -450,7 +450,7 @@ main() do_ tz_setup || { do_ chroot_cleanup; do_ umount; return 1; } do_ user_setup || { do_ chroot_cleanup; do_ umount; return 1; } do_ install_extra || { do_ chroot_cleanup; do_ umount; return 1; } - postinst || { do_ chroot_cleanup; do_ umount; return 1; } + do_ postinst || { do_ chroot_cleanup; do_ umount; return 1; } do_ chroot_cleanup || { do_ umount; return 1; } exec 4>&- mkdir -p "${target}/var/log/installer" |