From a1055a1c00a9645164cdcaab665a305c5b17a04e Mon Sep 17 00:00:00 2001 From: ms Date: Tue, 2 Jan 2007 19:12:43 +0000 Subject: [PATCH] THEME zum unattended hinzugefuegt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@376 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/syslinux/unattended.conf | 1 + src/install+setup/install/main.c | 37 +++----------------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/config/syslinux/unattended.conf b/config/syslinux/unattended.conf index b8ddba20c..a7a94e4d9 100644 --- a/config/syslinux/unattended.conf +++ b/config/syslinux/unattended.conf @@ -3,6 +3,7 @@ HOSTNAME=ipfire KEYMAP=/usr/share/kbd/keymaps/i386/qwerty/de.map.gz LANGUAGE=de TIMEZONE=/usr/share/zoneinfo/posix/Europe/Berlin +THEME=ipfire GREEN_ADDRESS=192.168.180.30 GREEN_NETMASK=255.255.255.0 GREEN_NETADDRESS=192.168.180.0 diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 3ca80da7a..44ce1f06b 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -46,40 +46,6 @@ int detect_smp() { return (cpu_count > 1); } -int generate_packages_list(char *packages, const char *rpmdir, const char *source) { - - FILE *fd=NULL; - char buffer[STRING_SIZE]; - bzero(buffer, sizeof(buffer)); - - if ((fd = fopen(source, "r")) == NULL) { - (void) fprintf(flog, "Packages file %s not found\n", source); - return -1; - } - while (fgets(buffer, sizeof(buffer), fd) != NULL) { - int length = -1; - length = strlen(buffer)-1; - if (length<=0) { - continue; - } - if (buffer[length] == '\n') { - buffer[length]='\0'; - } - length = snprintf(packages, STRING_SIZE, "%s %s/%s", strdup(packages), rpmdir, buffer); - if ((length <0) || (length >STRING_SIZE)) { - (void) fprintf(flog, "rpm command line too long: %d\n%s", length, packages); - return -1; - } - } - if (ferror(fd)) { - (void) fprintf(flog, "Error reading file\n"); - (void) fclose(fd); - return -1; - } - (void) fclose(fd); - return 0; -} - long calc_swapsize(long memory, long disk) { if (memory < 128) { return 256; @@ -102,6 +68,7 @@ int unattended_setup(struct keyvalue *unattendedkv) { char keymap[STRING_SIZE]; char language[STRING_SIZE]; char timezone[STRING_SIZE]; + char theme[STRING_SIZE]; char green_address[STRING_SIZE]; char green_netmask[STRING_SIZE]; char green_netaddress[STRING_SIZE]; @@ -114,6 +81,7 @@ int unattended_setup(struct keyvalue *unattendedkv) { findkey(unattendedkv, "KEYMAP", keymap); findkey(unattendedkv, "LANGUAGE", language); findkey(unattendedkv, "TIMEZONE", timezone); + findkey(unattendedkv, "THEME", theme); findkey(unattendedkv, "GREEN_ADDRESS", green_address); findkey(unattendedkv, "GREEN_NETMASK", green_netmask); findkey(unattendedkv, "GREEN_NETADDRESS", green_netaddress); @@ -127,6 +95,7 @@ int unattended_setup(struct keyvalue *unattendedkv) { replacekeyvalue(mainsettings, "KEYMAP", keymap); replacekeyvalue(mainsettings, "LANGUAGE", language); replacekeyvalue(mainsettings, "TIMEZONE", timezone); + replacekeyvalue(mainsettings, "THEME", theme); writekeyvalues(mainsettings, "/harddisk" CONFIG_ROOT "/main/settings"); freekeyvalues(mainsettings); -- 2.39.2