Added / to PXE kernel and initrd locations and solved vlan support error

rear · Mar 25, 2014 · db3fe67 · db3fe67
1 parent e305bbb
commit db3fe67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/usr/share/rear/output/PXE/default/81_create_pxelinux_cfg.sh b/usr/share/rear/output/PXE/default/81_create_pxelinux_cfg.sh
@@ -29,8 +29,8 @@ display $PXE_MESSAGE
 say ----------------------------------------------------------
 say rear = disaster recover this system with Relax and Recover
 label rear
-	kernel $PXE_KERNEL
-	append initrd=$PXE_INITRD root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE
+	kernel $OUTPUT_PREFIX/$PXE_KERNEL
+	append initrd=$OUTPUT_PREFIX/$PXE_INITRD root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE
 EOF
 
 pushd "$PXE_LOCAL_PATH" >&8

diff --git a/usr/share/rear/rescue/GNU/Linux/31_network_devices.sh b/usr/share/rear/rescue/GNU/Linux/31_network_devices.sh
@@ -220,7 +220,7 @@ if test -d /proc/net/vlan ; then
         # we might need it if we ever want to implement VLAN Migration
         echo "modprobe 8021q" >>$netscript
         echo "sleep 5" >>$netscript
-        VLANS=( $(ls /proc/net/vlan/vlan*) )
+        VLANS=( $(ls /proc/net/vlan/* | grep -v config) )
         for vlan in ${VLANS[*]##*/}
         do
             if ip link show dev $vlan | grep -q UP ; then