Bug 8729 - grub: create a script to boot between rootfs and a maintenance partition

new file mode 100755
index 0000000000..e89dbf53e2
@@ -0,0 +1,35 @@
+#!/bin/sh
+#/etc/init.d/bootcntr-rst: reset the grub boot counter.
+
+### BEGIN INIT INFO
+# Provides:          Grub boot counter reset
+# Short-Description: Resets the bootcntr grub env var
+# Required-Start:    $all
+# Required-Stop:     $all
+# Should-Start:      
+# Should-Stop:       
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+
+. /etc/init.d/functions
+
+case "$1" in
+    start)
+        /usr/bin/grub-editenv /boot/EFI/BOOT/bootcntr.env set bootcntr=0
+        ;;
+    stop)
+        echo "No stop available"
+	;;
+    status)
+        echo $(/usr/bin/grub-editenv /boot/EFI/BOOT/bootcntr.env list)
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status}"
+        exit 2
+esac
+
+
+
+
+

new file mode 100644
index 0000000000..3582036241
@@ -0,0 +1,9 @@
+[Unit]
+Description=Resets the grub boot counter. This should be used only for testing
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/grub-editenv /boot/EFI/BOOT/bootcntr.env set bootcntr=0
+
+[Install]
+WantedBy=multi-user.target

148 lines not on this page · raw message

index 14fce97ff0..56621d33f7 100644
@@ -85,7 +85,7 @@ do_install_class-target() {
 }
 
 GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \
-                 efi_gop iso9660 configfile search loadenv test"
+                 efi_gop iso9660 configfile search loadenv test hashsum eval echo cat reboot sleep read"
 
 do_deploy() {
 	install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${DEPLOYDIR}

new file mode 100644
index 0000000000..15e4da355f
@@ -0,0 +1,30 @@
+DESCRIPTION = "Service to reset the grub boot counter. This should be used only for testing!"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit systemd
+
+RDEPENDS_${PN} += "bash"
+
+SRC_URI = " \
+            file://bootcntr-rst.service \
+            file://bootcntr-rst.init \
+            "
+S = "${WORKDIR}"
+
+do_install[depends] = "grub-multibootconf:do_install"
+
+do_install () {
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/bootcntr-rst.init ${D}${sysconfdir}/init.d/bootcntr-rst
+	install -d ${D}${systemd_unitdir}/system/ ${D}${sysconfdir}/systemd/system/
+	install -m 0644 ${WORKDIR}/bootcntr-rst.service ${D}${systemd_unitdir}/system
+}
+
+INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_NAME = "bootcntr-rst"
+INITSCRIPT_PARAMS = "start 99 S ."
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "bootcntr-rst.service"
\ No newline at end of file

108 lines not on this page · raw message

index e0973759fb..cedabc7da8 100644
@@ -27,3 +27,5 @@ do_install_append () {
 
 INSANE_SKIP_${PN} = "arch"
 INSANE_SKIP_${PN}-dbg = "arch"
+
+BBCLASSEXTEND = "native"
\ No newline at end of file

deleted file mode 100644
index f61d941d6d..0000000000
@@ -1,23 +0,0 @@
-# short-description: Create multi rootfs image using rootfs plugin
-# long-description: Creates a partitioned disk image with two rootfs partitions
-# using rootfs plugin.
-#
-# Partitions can use either
-#   - indirect rootfs references to image recipe(s):
-#     wic create directdisk-multi-indirect-recipes -e core-image-minimal \
-#         --rootfs-dir rootfs1=core-image-minimal
-#         --rootfs-dir rootfs2=core-image-minimal-dev
-#
-#   - or paths to rootfs directories:
-#     wic create directdisk-multi-rootfs \
-#         --rootfs-dir rootfs1=tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/
-#         --rootfs-dir rootfs2=tmp/work/qemux86_64-poky-linux/core-image-minimal-dev/1.0-r0/rootfs/
-#
-#   - or any combinations of -r and --rootfs command line options
-
-part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024
-part / --source rootfs --rootfs-dir=rootfs1 --ondisk sda --fstype=ext4 --label platform --align 1024
-part /rescue --source rootfs --rootfs-dir=rootfs2 --ondisk sda --fstype=ext4 --label secondary --align 1024
-
-bootloader  --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 console=ttyS0,115200n8"
-

new file mode 100644
index 0000000000..d661063257
@@ -0,0 +1,22 @@
+# short-description: Create multi rootfs image using rootfs plugin
+#
+# This wks file is meant to be used when the grub-multibootconf is set as the
+# preferred RPROVIDER for virtual/grub-bootconf. By default the --source for
+# both partitions is set to the same image, but you can change that with any
+# image you wish. Because wic creates its own boot partition which overrides
+# the grub boot files from the grub-multibootconf recipe, you need to used the
+# --rootfs-dir and --exclude-path options.
+#
+# --rootfs-dir: This needs to point to the actual /boot folder in the image.
+#       Usually, this pointed by ${IMAGE_ROOTFS} variable. 
+#
+# --exclude-path: This will force wic tool to exclude the /boot folder in the
+#       rootfs and will not override it.
+#
+# With both options provided, wic tool will use the rootfs/boot folder to creates
+# the boot partition.
+#
+bootloader --ptable gpt
+part /boot --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/boot --fstype=vfat --ondisk sda --label boot --active --align 1024
+part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024 --exclude-path boot/
+part /rescue --source rootfs --ondisk sda --fstype=ext4 --label rescue --align 1024 --exclude-path boot/
\ No newline at end of file