mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
Merge branch 'current' of github.com:vyos/vyos-build into current
This commit is contained in:
commit
6b6bd49bb5
4
data/live-build-config/hooks/00-manifest.binary
Executable file
4
data/live-build-config/hooks/00-manifest.binary
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
echo I: Backwards compat packages.txt
|
||||||
|
echo "ii vyatta-version " > binary/live/packages.txt
|
||||||
6
data/live-build-config/hooks/17-kernel_symlinks.chroot
Executable file
6
data/live-build-config/hooks/17-kernel_symlinks.chroot
Executable file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
echo I: Creating kernel symlinks.
|
||||||
|
cd /boot
|
||||||
|
ln -s initrd.img-* initrd.img
|
||||||
|
ln -s vmlinuz-* vmlinuz
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
menuentry "VyOS (KVM console)" {
|
||||||
|
linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0
|
||||||
|
initrd /boot//initrd.img
|
||||||
|
}
|
||||||
|
|
||||||
|
menuentry "VyOS (Serial console)" {
|
||||||
|
linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600
|
||||||
|
initrd /boot//initrd.img
|
||||||
|
}
|
||||||
|
|
||||||
|
menuentry "Lost password change (KVM console)" {
|
||||||
|
linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset
|
||||||
|
initrd /boot//initrd.img
|
||||||
|
}
|
||||||
|
|
||||||
|
menuentry "Lost password change (Serial console)" {
|
||||||
|
linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset
|
||||||
|
initrd /boot//initrd.img
|
||||||
|
}
|
||||||
|
|
||||||
17
data/live-build-config/includes.chroot/opt/vyatta/etc/install-image/postinst
Executable file
17
data/live-build-config/includes.chroot/opt/vyatta/etc/install-image/postinst
Executable file
@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
source /opt/vyatta/sbin/install-functions
|
||||||
|
|
||||||
|
NEWVER=`mount | grep /mnt/inst_root`
|
||||||
|
NEWVER=${NEWVER#*upperdir=/live/image/boot/}
|
||||||
|
NEWVER=${NEWVER%/live-rw*}
|
||||||
|
DISK_LABEL=`mount | grep /live/image | awk '{print $1}' | grep dev`
|
||||||
|
|
||||||
|
if [ -d "/live/image" ]; then
|
||||||
|
e2label "${DISK_LABEL}" persistence
|
||||||
|
if [ ! -f /live/image/persistence.conf ]; then
|
||||||
|
echo "/ union" > /live/image/persistence.conf
|
||||||
|
fi
|
||||||
|
rm -f /live/image/boot/"${NEWVER}"/live-rw/etc/fstab
|
||||||
|
mv /live/image/boot/"${NEWVER}"/live-rw /live/image/boot/"${NEWVER}"/rw
|
||||||
|
fi
|
||||||
Loading…
x
Reference in New Issue
Block a user