From: Andres Salomon <dilinger@queued.net>
Date: Sat, 20 Nov 2010 02:08:38 +0000 (-0800)
Subject: mkchroot: allow group addition to fail
X-Git-Tag: v0.6~11
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b00560c2925e83c31ccc2e39aa780ab0ba7460;p=xodist

mkchroot: allow group addition to fail

We don't actually care about group additions that much; they're to allow
permission for various (per-config) packages that get installed.

Signed-off-by: Andres Salomon <dilinger@queued.net>
---

diff --git a/mkchroot.sh b/mkchroot.sh
index 13dcc8c..2b4bc59 100755
--- a/mkchroot.sh
+++ b/mkchroot.sh
@@ -167,13 +167,13 @@ package_configure_hook "${ROOT_DIR}"
 rm -rf ${ROOT_DIR}/home/*; 	# i have no idea what's adding this crap...
 (chroot ${ROOT_DIR} useradd -s /bin/bash --create-home ${DEFUSER})
 (chroot ${ROOT_DIR} passwd -d ${DEFUSER})
-(chroot ${ROOT_DIR} adduser ${DEFUSER} cdrom)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} audio)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} video)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} netdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} floppy)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} cdrom || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} audio || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} video || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} netdev || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} floppy || true)
 echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
 
 # override sources.list with shipping version