Permalink
Browse files

license activation at the end after first login

  • Loading branch information...
jacalvo committed Nov 4, 2018
1 parent 5c4d58b commit 2342450382b799cc1672c66c0e0c387748bd05ec
@@ -35,16 +35,6 @@ pushd $TMPDIR/zinstaller-headless
dpkg-buildpackage
popd
if [[ $VERSION = *"commercial"* ]]
then
# Build zinstaller-remote udeb
cp -rL zinstaller-remote $TMPDIR/zinstaller-remote
pushd $TMPDIR/zinstaller-remote
[ -f zinstaller-remote/jq ] || ./build-jq.sh
dpkg-buildpackage
popd
fi
for ARCH in $ARCHS
do
if [ -n "$SELECTED_ARCH" ] && [ "$ARCH" != "$SELECTED_ARCH" ]
@@ -72,15 +62,6 @@ do
fi
done
# Add zinstaller-remote udeb
if [[ $VERSION = *"commercial"* ]]
then
UDEB_DIR=$CD_BUILD_DIR/pool/main/z/zinstaller-remote
mkdir -p $UDEB_DIR
rm $UDEB_DIR/*
cp $TMPDIR/zinstaller-remote*.udeb $UDEB_DIR/
fi
# Add zinstaller-headless udeb
UDEB_DIR=$CD_BUILD_DIR/pool/main/z/zinstaller-headless
mkdir -p $UDEB_DIR
@@ -12,6 +12,13 @@ do
cp $file $PKG_DIR 2> /dev/null
done
if [ -f /media/cdrom/zentyal/commercial-edition ]
then
mkdir -p /var/lib/zentyal/
touch /var/lib/zentyal/.commercial-edition
echo ACTIVATION-REQUIRED > /var/lib/zentyal/.license
fi
sed -i 's/#GRUB_HIDDEN_TIMEOUT=0/GRUB_HIDDEN_TIMEOUT=0/' /etc/default/grub
sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=".*\)"/\1 net.ifnames=0 biosdevname=0"/' /etc/default/grub
update-grub
@@ -28,13 +28,4 @@ d-i time/zone string Europe/Madrid
# finish
d-i finish-install/reboot_in_progress note
zinstaller-remote zinstaller-remote/user string REMOTE_USER
zinstaller-remote zinstaller-remote/pass password REMOTE_PASS
zinstaller-remote zinstaller-remote/auth_ok_community note
zinstaller-remote zinstaller-remote/auth_ok_sb note
zinstaller-remote zinstaller-remote/auth_ok_enterprise note
zinstaller-remote zinstaller-remote/select_bundle select
zinstaller-remote zinstaller-remote/select_hostname_recover select HOSTNAME_RECOVER
#zinstaller-remote zinstaller-remote/no_register note
d-i debian-installer/allow-unauthenticated string true
@@ -23,7 +23,7 @@ mkdir $BUILD_DIR/indices
for i in autobuild build_cd.sh generate_extras.sh setup-base-cd-image.sh extract-core-deps.sh \
regen_iso.sh list-duplicated.sh list-not-installed.sh replace-debs-ppa.sh \
set-debug.sh zenbuntu-core zenbuntu-desktop zinstaller-remote zinstaller-headless data images
set-debug.sh zenbuntu-core zenbuntu-desktop zinstaller-headless data images
do
ln -s $cwd/$i $BUILD_DIR/$i
done
@@ -23,16 +23,6 @@ fi
UDEB_INCLUDE=$CD_BUILD_DIR/.disk/udeb_include
if [[ $VERSION = *"commercial"* ]]
then
if ! grep -q zinstaller-remote $UDEB_INCLUDE
then
echo zinstaller-remote >> $UDEB_INCLUDE
fi
sed -i '/zentyal.org/d' $CD_BUILD_DIR/preseed/*.seed
fi
if ! grep -q zinstaller-headless $UDEB_INCLUDE
then
echo zinstaller-headless >> $UDEB_INCLUDE
@@ -95,3 +85,8 @@ cp -r $DATA_DIR $TMPDIR
cp -r $TMPDIR/* $CD_ZENTYAL_DIR/
rm -rf $TMPDIR
if [[ $VERSION = *"commercial"* ]]
then
touch $CD_ZENTYAL_DIR/commercial-edition
fi
@@ -84,7 +84,7 @@ create_repository # Set up local package repository
update_if_network # apt-get update if we are connected to the internet
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y zentyal
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -o DPkg::Options::="--force-confdef" zentyal
gen_locales
@@ -11,9 +11,6 @@ then
rm -rf /var/tmp/zentyal-packages
apt-get clean
# Remove autosubscription data
rm -rf /var/lib/zinstaller-remote
# Restore default rc.local and execute it
cp /usr/share/zenbuntu-core/rc.local /etc/rc.local
. /etc/rc.local
@@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: zinstaller-remote\n"
"Project-Id-Version: zinstaller-headless\n"
"Report-Msgid-Bugs-To: zinstaller-headless@packages.debian.org\n"
"POT-Creation-Date: 2013-05-06 19:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 2342450

Please sign in to comment.