Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=bd54f79f3df1f26c589da4f36eb14d1b1259c159
commit bd54f79f3df1f26c589da4f36eb14d1b1259c159
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Tue Jul 1 22:33:02 2008 +0200
formatdisk: create dirs under /var _after_ mounting a possible /var
closes #3158
diff --git a/src/plugins/formatdisk.c b/src/plugins/formatdisk.c
index 94e872f..a239a27 100644
--- a/src/plugins/formatdisk.c
+++ b/src/plugins/formatdisk.c
@@ -563,28 +563,6 @@ int run(GList **config)
chmod (np, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
FREE(np);
- makepath(g_strdup_printf("%s/%s", TARGETDIR, "/var/log"));
- np = g_strdup_printf("%s/%s", TARGETDIR, LOGFILE);
- copyfile(LOGFILE, np);
- unlink(LOGFILE);
- chmod (np, S_IRUSR|S_IWUSR);
- FREE(np);
-
- // disable caching for cds
- // this is needed here since when the cds is loaded we had no
- // formatted root partition
- if((char*)data_get(*config, "netinstall")==NULL)
- {
- char *pacbindir = g_strdup_printf("%s/frugalware-%s",
SOURCEDIR, ARCH);
- char *ptr;
-
- ptr = g_strdup_printf("%s/var/cache/pacman/pkg", TARGETDIR);
- makepath(ptr);
- FREE(ptr);
- disable_cache(pacbindir);
- FREE(pacbindir);
- }
-
// non-root partitions
dialog_vars.backtitle=gen_backtitle(_("Selecting other partitions"));
while(1)
@@ -627,5 +605,27 @@ int run(GList **config)
else
break;
}
+
+ makepath(g_strdup_printf("%s/%s", TARGETDIR, "/var/log"));
+ np = g_strdup_printf("%s/%s", TARGETDIR, LOGFILE);
+ copyfile(LOGFILE, np);
+ unlink(LOGFILE);
+ chmod (np, S_IRUSR|S_IWUSR);
+ FREE(np);
+
+ // disable caching for cds
+ // this is needed here since when the cds is loaded we had no
+ // formatted root partition
+ if((char*)data_get(*config, "netinstall")==NULL)
+ {
+ char *pacbindir = g_strdup_printf("%s/frugalware-%s",
SOURCEDIR, ARCH);
+ char *ptr;
+
+ ptr = g_strdup_printf("%s/var/cache/pacman-g2/pkg", TARGETDIR);
+ makepath(ptr);
+ FREE(ptr);
+ disable_cache(pacbindir);
+ FREE(pacbindir);
+ }
return(0);
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
