mirror of
https://github.com/rancher/os.git
synced 2025-08-31 22:32:14 +00:00
move auto-formatter drive selection logic to os-autoformat container
and get rid of: - machine-rancheros.iso, - special case in build-images, - some bootstrap.go code
This commit is contained in:
@@ -40,7 +40,7 @@ chmod +x ${INITRD_DIR}/docker #ini
|
||||
|
||||
ln -sf bin/rancheros ./ros
|
||||
|
||||
for i in $(./ros c images -i os-config.yml) rancher/os-autoformat:${VERSION}; do
|
||||
for i in $(./ros c images -i os-config.yml); do
|
||||
docker pull ${i}
|
||||
done
|
||||
docker save $(./ros c images -i os-config.yml) rancher/os-autoformat:${VERSION} > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar
|
||||
docker save $(./ros c images -i os-config.yml) > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar
|
||||
|
@@ -30,7 +30,7 @@ default rancheros
|
||||
label rancheros
|
||||
kernel /boot/vmlinuz
|
||||
initrd /boot/initrd
|
||||
append quiet rancher.password=rancher
|
||||
append quiet rancher.password=rancher rancher.state.autoformat=[/dev/sda,/dev/vda]
|
||||
EOF
|
||||
|
||||
cd ${CD}
|
||||
@@ -44,24 +44,6 @@ xorriso \
|
||||
-isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
|
||||
-o ${DIST}/artifacts/rancheros.iso $(pwd)
|
||||
|
||||
cat > ${CD}/boot/isolinux/isolinux.cfg << EOF
|
||||
default rancheros
|
||||
label rancheros
|
||||
kernel /boot/vmlinuz
|
||||
initrd /boot/initrd
|
||||
append quiet rancher.password=rancher rancher.state.autoformat=[/dev/sda,/dev/vda]
|
||||
EOF
|
||||
|
||||
cd ${CD}
|
||||
xorriso \
|
||||
-publisher "Rancher Labs, Inc." \
|
||||
-as mkisofs \
|
||||
-l -J -R -V "RancherOS" \
|
||||
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
||||
-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
|
||||
-isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
|
||||
-o ${DIST}/artifacts/machine-rancheros.iso $(pwd)
|
||||
|
||||
|
||||
if [ -e ${DIST}/artficats/iso-checksums.txt ]; then
|
||||
rm ${DIST}/artficats/iso-checksums.txt
|
||||
|
Reference in New Issue
Block a user