Merge lp:~npochet/obinstaller/obinstaller into lp:obinstaller

Proposed by Nicolas Pochet
Status: Merged
Approved by: Craig Bender
Approved revision: 332
Merged at revision: 330
Proposed branch: lp:~npochet/obinstaller/obinstaller
Merge into: lp:obinstaller
Diff against target: 75 lines (+9/-7)
3 files modified
.bzrignore (+2/-0)
customize-live.sh (+5/-5)
scripts/first-boot.sh (+2/-2)
To merge this branch: bzr merge lp:~npochet/obinstaller/obinstaller
Reviewer Review Type Date Requested Status
Craig Bender Approve
Review via email: mp+350582@code.launchpad.net

Commit message

Fix typo and missing iso hybrid file

To post a comment you must log in.
lp:~npochet/obinstaller/obinstaller updated
331. By Nicolas Pochet

Ensure that isolinux is installed

Install isolinux package to be able to copy everyting coming from /usr/lib/ISOLINUX

332. By Nicolas Pochet

Fix /etc/fstab

Fix the awk command to get:
UUID=XXX /mountpoint fs-type options X X
instead of:
LABEL=XXX /mountpoint UUID=XXX options X X

Revision history for this message
Craig Bender (craig-bender) :
review: Approve
Revision history for this message
Nicolas Pochet (npochet) wrote :

Could you please merge it?

Revision history for this message
Craig Bender (craig-bender) wrote :

Yes, sorry. I was in wrong directory when I first merged (old obinstall)
and didn't notice the failure. All done now.

On Thu, Sep 6, 2018 at 3:14 AM Nicolas Pochet <email address hidden>
wrote:

> Could you please merge it?
> --
> https://code.launchpad.net/~npochet/obinstaller/obinstaller/+merge/350582
> You are reviewing the proposed merge of
> lp:~npochet/obinstaller/obinstaller into lp:obinstaller.
>

--
*Craig Bender*
Solutions Architect
*Canonical*
Direct Dial: +1 702-595-5899
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2017-11-04 16:39:52 +0000
3+++ .bzrignore 2018-09-06 12:35:57 +0000
4@@ -10,3 +10,5 @@
5 post-install.log
6 remmina-amt-install.log
7 remina-amt-install.log
8+log/
9+apt-logs/
10
11=== modified file 'customize-live.sh'
12--- customize-live.sh 2018-01-03 21:10:13 +0000
13+++ customize-live.sh 2018-09-06 12:35:57 +0000
14@@ -286,7 +286,7 @@
15 declare -ag INSTALL_TOOLS=()
16 command -v syslinux >> ${LOG} 2>&1 || INSTALL_TOOLS+=('syslinux*')
17 command -v pv >> ${LOG} 2>&1 || INSTALL_TOOLS+=(pv)
18-command -v sdparm >> ${LOG} 2>&1 || INSTALL_TOOLS=+=(sdparm)
19+command -v sdparm >> ${LOG} 2>&1 || INSTALL_TOOLS+=(sdparm)
20 command -v isohybrid >> ${LOG} 2>&1 || INSTALL_TOOLS+=(syslinux-utils)
21 command -v xorriso >> ${LOG} 2>&1 || INSTALL_TOOLS+=(xorriso)
22 command -v parted >> ${LOG} 2>&1 || INSTALL_TOOLS+=(parted)
23@@ -296,6 +296,8 @@
24 command -v debconf-get-selections >> ${LOG} 2>&1 || INSTALL_TOOLS+=(debconf-utils)
25 command -v ssh-import-id >> ${LOG} 2>&1 || INSTALL_TOOLS+=(ssh-import-id)
26 command -v apt-rdepends >> ${LOG} 2>&1 || INSTALL_TOOLS+=(apt-rdepends)
27+INSTALL_TOOLS+=(isolinux)
28+
29 if [[ ${#INSTALL_TOOLS[@]} -eq 0 ]];then
30 tstatus
31 else
32@@ -317,7 +319,7 @@
33 printf "\e[2GFound ${FILE}\n"
34 if [[ ${list} != SSH_KEYS ]];then
35 declare -ag ARR=$(eval echo "${list}_LIST")
36- read -ra $ARR <<<$(awk '!SEEN[$1]++&&!/^#/&&!/^$/{gsub(/#.*$/,"");print}' ${FILE})
37+ mapfile -t $ARR <<<$(awk '!SEEN[$1]++&&!/^#/&&!/^$/{gsub(/#.*$/,"");print}' ${FILE})
38 export ARR_CNT=$(eval echo "\${#$ARR[@]}")
39 [[ $(eval echo $ARR_CNT) -lt 1 ]] && { printf "\e[4G - $(eval echo $ARR_CNT) entries found in ${FILE}. Skipping\n\n"; }
40
41@@ -753,11 +755,9 @@
42 [[ -f ${IMAGE_NAME} ]] && printf "\e[2G - Removing earlier version of ${IMAGE_NAME}"
43 [[ -f ${IMAGE_NAME} ]] && { $SCMD rm -rf ${IMAGE_NAME};tstatus; }
44
45-#printf "\e[2GCreating remastered Live CD Image\n"
46-prog-wait -l ${LOG} -s spin-spin -c "\e[2G - Creating remastered Live CD Image" $SCMD xorriso -as mkisofs -quiet -isohybrid-mbr isolinux/isohdpfx.bin -c isolinux/boot.cat -b isolinux/isolinux.bin -volid "${VOLUME_NAME}" -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -o ${IMAGE_NAME} .
47+prog-wait -l ${LOG} -s spin-spin -c "\e[2G - Creating remastered Live CD Image" $SCMD xorriso -as mkisofs -isohybrid-mbr isolinux/isohdpfx.bin -c isolinux/boot.cat -b isolinux/isolinux.bin -volid "${VOLUME_NAME}" -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -o ${IMAGE_NAME} .
48 [[ $? -eq 0 ]] || { printf "\e[4G\e[1;31mFailed to create ISO. Exiting.\e[0m\n"; exit 1; }
49
50-
51 fdisk -lu ${IMAGE_NAME}|sed -n '/Device/,/EFI/p'|wrap -i 4 -w $(tput cols)
52
53 if [[ ${KEEP_WORKING_DIR} = false ]];then
54
55=== modified file 'scripts/first-boot.sh'
56--- scripts/first-boot.sh 2017-12-18 23:00:46 +0000
57+++ scripts/first-boot.sh 2018-09-06 12:35:57 +0000
58@@ -227,7 +227,7 @@
59 if [[ -z $(mount|awk '/'${DATA_DISK:5:3}'1/&&/\/srv/') ]];then
60 printf "\e[2G - Mounting ${DATA_DISK:5:3}1 as /srv "
61 if [[ -n ${DATA_DISK} && -z $(grep -o $(blkid ${DATA_DISK}1 -s UUID|awk -F'"' '{print $2}') /etc/fstab) ]];then
62- sudo blkid ${DATA_DISK}1 |awk '{gsub(/"|TYPE=|PART.$/,"");print $2"\t/srv\t"$3"\trw,relatime,data=ordered \t0\t0"}'|sudo tee 1>/dev/null -a /etc/fstab
63+ sudo blkid ${DATA_DISK}1 |awk '{gsub(/"|TYPE=|PART.$/,"");print $3"\t/srv\t"$4"\trw,relatime,data=ordered \t0\t0"}'|sudo tee 1>/dev/null -a /etc/fstab
64 [[ $? -eq 0 ]] && sudo mount /srv
65 [[ $? -eq 0 ]] && export SRV_MOUNTED=true || export SRV_MOUNTED=false
66 [[ $SRV_MOUNTED = true ]] && { printf "\e[4G - Successfully mounted /srv on ${DATA_DISK:5:3}1";tstatus; }
67@@ -248,7 +248,7 @@
68 if [[ -z $(swapon |grep -o ${DATA_DISK:5:3}2) ]];then
69 printf "\e[2G - Mounting ${DATA_DISK:5:3}2 as swap "
70 if [[ -n ${DATA_DISK} && -z $(grep -o $(blkid ${DATA_DISK}2 -s UUID|awk -F'"' '{print $2}') /etc/fstab) ]];then
71- sudo blkid ${DATA_DISK}2 |awk '{gsub(/"|TYPE=|PART.$/,"");print $2"\tnone\t"$3"\tsw\t0\t0"}'|sudo tee 1>/dev/null -a /etc/fstab
72+ sudo blkid ${DATA_DISK}2 |awk '{gsub(/"|TYPE=|PART.$/,"");print $3"\tnone\t"$4"\tsw\t0\t0"}'|sudo tee 1>/dev/null -a /etc/fstab
73 [[ $? -eq 0 ]] && sudo swapon -a
74 [[ $? -eq 0 ]] && export SWAP_MOUNTED=true || export SWAP_MOUNTED=false
75 [[ $SWAP_MOUNTED = true ]] && { printf "\e[4G - /swap successfully mounted on ${DATA_DISK:5:3}2";tstatus; }

Subscribers

People subscribed via source and target branches