--- trunk/grubby/grubby.c	2013/10/21 13:59:08	2252
+++ trunk/grubby/grubby.c	2013/10/21 14:01:48	2257
@@ -297,13 +297,56 @@
     return ret;
 }
 
+static int sPopCount(const char *s, const char *c)
+{
+    int ret = 0;
+    if (!s)
+	return -1;
+    for (int i = 0; s[i] != '\0'; i++)
+	for (int j = 0; c[j] != '\0'; j++)
+	    if (s[i] == c[j])
+		ret++;
+    return ret;
+}
+
+static char *shellEscape(const char *s)
+{
+    int l = strlen(s) + sPopCount(s, "'") * 2;
+
+    char *ret = calloc(l+1, sizeof (*ret));
+    if (!ret)
+	return NULL;
+    for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
+	if (s[i] == '\'')
+	    ret[j++] = '\\';
+	ret[j] = s[i];
+    }
+    return ret;
+}
+
+static void unquote(char *s)
+{
+    int l = strlen(s);
+
+    if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
+	memmove(s, s+1, l-2);
+	s[l-2] = '\0';
+    }
+}
+
 static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
 {
     char *s = NULL;
     int rc = 0;
     char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";
 
+    unquote(value);
+    value = shellEscape(value);
+    if (!value)
+	    return -1;
+
     rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);
+    free(value);
     if (rc <0)
 	return -1;
 
@@ -4360,6 +4403,9 @@
         char * rootspec;
 
 	if (config->defaultImage == -1) return 0;
+	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+		cfi->defaultIsSaved)
+	    config->defaultImage = 0;
 	entry = findEntryByIndex(config, config->defaultImage);
 	if (!entry) return 0;
 	if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
@@ -4378,6 +4424,9 @@
 	struct singleEntry * entry;
 
 	if (config->defaultImage == -1) return 0;
+	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+		cfi->defaultIsSaved)
+	    config->defaultImage = 0;
 	entry = findEntryByIndex(config, config->defaultImage);
 	if (!entry) return 0;
 
@@ -4400,6 +4449,9 @@
 
     } else if (displayDefaultIndex) {
         if (config->defaultImage == -1) return 0;
+	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+		cfi->defaultIsSaved)
+	    config->defaultImage = 0;
         printf("%i\n", config->defaultImage);
         return 0;