ROOTFSCFG => _RUMPRUN_ROOTFSCFG

Just makes it a bit less likely to have a collision.

diff --git a/app-tools/rumprun b/app-tools/rumprun
index c8503829a600f225d237bbf196d00c450efe42aa..47fa529f60ac39abf7d369a7e45e847af8af449e 100755 (executable)
--- a/app-tools/rumprun
+++ b/app-tools/rumprun
@@ -785,8 +785,8 @@ bake_iso ()
        mkdir -p "${ISODIR}/boot/grub"
        printf 'set timeout=0\n' > "${ISODIR}/boot/grub/grub.cfg"
        printf 'menuentry "rumpkernel" {\n' >> "${ISODIR}/boot/grub/grub.cfg"
-       printf '\tmultiboot /boot/%s ROOTFSCFG=/json.cfg\n}\n' $(basename $1) \
-           >> "${ISODIR}/boot/grub/grub.cfg"
+       printf '\tmultiboot /boot/%s _RUMPRUN_ROOTFSCFG=/json.cfg\n}\n' \
+           $(basename $1) >> "${ISODIR}/boot/grub/grub.cfg"
        cp ${bootimage} "${ISODIR}/boot"
        cp "${TMPDIR}/json.cfg" "${ISODIR}"
        grub-mkrescue "${ISODIR}" -o ${opt_name}
@@ -867,7 +867,7 @@ make_ec2 ()
        printf 'default 0\ntimeout 1\n' > "${EC2DIR}/boot/grub/menu.lst"
        printf 'title %s\n' "${opt_name}" >> "${EC2DIR}/boot/grub/menu.lst"
        printf '  root (hd0)\n' >> "${EC2DIR}/boot/grub/menu.lst"
-       printf '  kernel /boot/%s ROOTFSCFG=/json.cfg\n' \
+       printf '  kernel /boot/%s _RUMPRUN_ROOTFSCFG=/json.cfg\n' \
            $(basename ${bootimage}) >> "${EC2DIR}/boot/grub/menu.lst"
        cp ${bootimage} "${EC2DIR}/boot"
        cp "${TMPDIR}/json.cfg" "${EC2DIR}"

diff --git a/lib/librumprun_base/rumpconfig.c b/lib/librumprun_base/rumpconfig.c
index 4f1a6f665d9042a838a997a8d5f9305c61f1aa7b..0a77cd947eaa75e2f9fdf9b02295ed0e770144d5 100644 (file)
--- a/lib/librumprun_base/rumpconfig.c
+++ b/lib/librumprun_base/rumpconfig.c
@@ -611,7 +611,7 @@ getcmdlinefromroot(const char *cfgname)
 }
 
 
-#define ROOTCFG "ROOTFSCFG="
+#define ROOTCFG "_RUMPRUN_ROOTFSCFG="
 static const size_t rootcfglen = sizeof(ROOTCFG)-1;
 char *
 rumprun_config_path(char *cmdline)