Move path maniuplation functions to devices/paths.c

[petitboot] / devices / parser-tests / 001 / expected-output

diff --git a/devices/parser-tests/001/expected-output b/devices/parser-tests/001/expected-output
index 6e686714a4452e700b3e1c3a6eb74aae45b210d3..9d2d0ecc8c7181f4b055b236fec0f99078e35799 100644 (file)
--- a/devices/parser-tests/001/expected-output
+++ b/devices/parser-tests/001/expected-output
@@ -1,24 +1,24 @@
-[dev  0] id: sda1
+[dev  0] id: ps3da1
 [dev  0] name: (null)
 [dev  0] description: (null)
 [dev  0] boot_image: /usr/share/petitboot/artwork/hdd.png
 [opt  0] name: live
 [opt  0] description: /casper/vmlinux root=/dev/ram0 initrd=/casper/initrd.gz   file=/cdrom/preseed/ubuntu.seed boot=casper quiet splash --
-[opt  0] boot_image: devices/parser-tests/001//casper/vmlinux
-[opt  0] initrd: devices/parser-tests/001//casper/initrd.gz
+[opt  0] boot_image: devices/parser-tests/001/ps3da1//casper/vmlinux
+[opt  0] initrd: devices/parser-tests/001/ps3da1//casper/initrd.gz
 [opt  0] boot_args: root=/dev/ram0 initrd=/casper/initrd.gz   file=/cdrom/preseed/ubuntu.seed boot=casper quiet splash --
 [opt  1] name: live_nosplash
 [opt  1] description: /casper/vmlinux root=/dev/ram0 initrd=/casper/initrd.gz   file=/cdrom/preseed/ubuntu.seed boot=casper quiet --
-[opt  1] boot_image: devices/parser-tests/001//casper/vmlinux
-[opt  1] initrd: devices/parser-tests/001//casper/initrd.gz
+[opt  1] boot_image: devices/parser-tests/001/ps3da1//casper/vmlinux
+[opt  1] initrd: devices/parser-tests/001/ps3da1//casper/initrd.gz
 [opt  1] boot_args: root=/dev/ram0 initrd=/casper/initrd.gz   file=/cdrom/preseed/ubuntu.seed boot=casper quiet --
 [opt  2] name: driverupdates
 [opt  2] description: /casper/vmlinux root=/dev/ram0 initrd=/casper/initrd.gz   file=/cdrom/preseed/ubuntu.seed boot=casper debian-installer/driver-update=true quiet splash --
-[opt  2] boot_image: devices/parser-tests/001//casper/vmlinux
-[opt  2] initrd: devices/parser-tests/001//casper/initrd.gz
+[opt  2] boot_image: devices/parser-tests/001/ps3da1//casper/vmlinux
+[opt  2] initrd: devices/parser-tests/001/ps3da1//casper/initrd.gz
 [opt  2] boot_args: root=/dev/ram0 initrd=/casper/initrd.gz   file=/cdrom/preseed/ubuntu.seed boot=casper debian-installer/driver-update=true quiet splash --
 [opt  3] name: check
 [opt  3] description: /casper/vmlinux root=/dev/ram0 initrd=/casper/initrd.gz   boot=casper integrity-check quiet splash --
-[opt  3] boot_image: devices/parser-tests/001//casper/vmlinux
-[opt  3] initrd: devices/parser-tests/001//casper/initrd.gz
+[opt  3] boot_image: devices/parser-tests/001/ps3da1//casper/vmlinux
+[opt  3] initrd: devices/parser-tests/001/ps3da1//casper/initrd.gz
 [opt  3] boot_args: root=/dev/ram0 initrd=/casper/initrd.gz   boot=casper integrity-check quiet splash --