diff options
3 files changed, 19 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb index 7398cbdbc..2137de414 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb @@ -14,3 +14,4 @@ DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service" SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service" SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubiattach.service" SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubimount@.service" +SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-squashfsmount@.service" diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service new file mode 100644 index 000000000..1bf15bfd4 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Mount SquashFS image pnor-ro-%I +Requires=obmc-flash-bios-ubiattach.service +After=obmc-flash-bios-ubiattach.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/sh -c '{sbindir}/ubimkvol /dev/ubi0 -N pnor-ro-%i -s 32MiB --type=static; \ + mkdir /media/pnor-ro-%i; \ + volumeid%i=`ubinfo -d 0 -N pnor-ro-%i | grep "Volume ID" | sed -e "s|Volume ID:||" -e "s/^ *//" | grep -o "^\S*"`; \ + ubiblock --create /dev/ubi0_$volumeid%i; \ + ubiupdatevol /dev/ubi0_$volumeid%i /tmp/images/%i/pnor.xz.squashfs; \ + mount -t squashfs -o ro /dev/ubiblock0_$volumeid%i /media/pnor-ro-%i' diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service index 331ed6bc6..5abab7f21 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service +++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service @@ -1,11 +1,11 @@ [Unit] -Description=Mount UBIFS volume pnor-rw%I +Description=Mount UBIFS volume pnor-rw-%I Requires=obmc-flash-bios-ubiattach.service After=obmc-flash-bios-ubiattach.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/bin/sh -c '{sbindir}ubimkvol /dev/ubi0 -N pnor-rw%i -s 1MiB; \ - mkdir /media/pnor-rw%i; \ - mount -t ubifs ubi0:pnor-rw%i /media/pnor-rw%i' +ExecStart=/bin/sh -c '{sbindir}/ubimkvol /dev/ubi0 -N pnor-rw-%i -s 1MiB; \ + mkdir /media/pnor-rw-%i; \ + mount -t ubifs ubi0:pnor-rw-%i /media/pnor-rw-%i' |
