|
|
@ -568,7 +568,7 @@ function build_chroot() { |
|
|
|
|
|
|
|
|
cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $BUILD_DIR/etc/apt/sources.list |
|
|
cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $BUILD_DIR/etc/apt/sources.list |
|
|
|
|
|
|
|
|
if [ -d /opt/minios-live ]; then |
|
|
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then |
|
|
chroot $BUILD_DIR /usr/bin/env \ |
|
|
chroot $BUILD_DIR /usr/bin/env \ |
|
|
OUTPUT=$OUTPUT \ |
|
|
OUTPUT=$OUTPUT \ |
|
|
LOGPATH=$LOGPATH \ |
|
|
LOGPATH=$LOGPATH \ |
|
|
@ -611,7 +611,7 @@ function build_live() { |
|
|
cd /linux-live |
|
|
cd /linux-live |
|
|
./build |
|
|
./build |
|
|
EOF' |
|
|
EOF' |
|
|
if [ -d /opt/minios-live ]; then |
|
|
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then |
|
|
chroot $BUILD_DIR /usr/bin/env \ |
|
|
chroot $BUILD_DIR /usr/bin/env \ |
|
|
OUTPUT=$OUTPUT \ |
|
|
OUTPUT=$OUTPUT \ |
|
|
LOGPATH=$LOGPATH \ |
|
|
LOGPATH=$LOGPATH \ |
|
|
@ -697,7 +697,7 @@ function build_iso() { |
|
|
echo ">>> No isohybrid to hybridize this ISO" |
|
|
echo ">>> No isohybrid to hybridize this ISO" |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
if [ $BUILD_TEST_ISO="1" ]; then |
|
|
if [ $BUILD_TEST_ISO = "1" ]; then |
|
|
if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then |
|
|
if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then |
|
|
echo ">>> $ISO_DIR/$LIVEKITNAME.iso created" |
|
|
echo ">>> $ISO_DIR/$LIVEKITNAME.iso created" |
|
|
fi |
|
|
fi |
|
|
|
