Finished offline mode setup

- Removed package list from installer-user-data, and added a placemarker
   instead
 - geninstaller inserts the package list INSTALLER_DEPS into
   installer-user-data if OFFLINE is set to no, if OFFLINE is set to yes,
   geninstaller chroots into rootfs and does apt-get install for everything in
   INSTALLER_DEPS
This commit is contained in:
Wesley Wiedenmeier 2015-07-22 15:59:23 -05:00
parent a93b4bbda5
commit 20a2870d32
2 changed files with 11 additions and 12 deletions

View File

@ -301,7 +301,6 @@ generate_seed() {
local cachedir=${2};
local seed=$cachedir/seed/nocloud-net
local installer_user_data=${TOPDIR}/resources/user-data/installer-user-data
local installer_user_data_offline=${TOPDIR}/resources/user-data/installer-offline-data
# create curtin payload
log "Generating curtin payload file"
@ -327,8 +326,13 @@ generate_seed() {
rm -f ${seed}/user-data &&
cp $installer_user_data $seed/user-data &&
if [ "${OFFLINE}" == "yes" ]; then
log "Disabling package_update/upgrade"
if [ "${OFFLINE}" == "no" ]; then
log "Enabling cloud-init package installation"
local packages=""
for pkg in ${INSTALLER_DEPS[@]}; do
packages="$packages - $pkg\n"
done
sed -i "s/#packages/packages:\n$packages/" ${seed}/user-data
fi
userdata_write_file "/usr/local/bin/curtin-archive" \
@ -451,9 +455,9 @@ generate_img() {
log "Installing bootloader configuration"
set +x
sudo mkdir -p ${mnt}/proc
sudo mkdir -p ${mnt}/sys
sudo mkdir -p ${mnt}/dev
sudo mkdir ${mnt}/proc
sudo mkdir ${mnt}/sys
sudo mkdir ${mnt}/dev
sudo mount none -t proc ${mnt}/proc &&
sudo mount none -t sysfs ${mnt}/sys &&
sudo mount -o bind /dev ${mnt}/dev &&

View File

@ -9,12 +9,7 @@ bootcmd:
password: passw0rd
chpasswd: { expire: False }
output: {all: '| tee -a /var/log/cloud-init-output.log'}
packages:
- python-urwid
- python3-urwid
- python3-parted
- python3-pyudev
- python3-netifaces
#packages
runcmd:
- tar -C /usr/local -xf /tmp/subiquity.tar
- tar -C /usr/local -xf /tmp/probert.tar