diff --git a/Makefile b/Makefile index 6a50392..9f730bd 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ update-repo: iso: ln -sf `pwd` /tmp/qubes-installer revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd + rpm --checksig build/work/revisor-install/R1-Beta1/qubes-x86_64/x86_64/os/Packages/*.rpm | grep -v pgp && exit 1 || true clean: rm -fr rpm/SOURCES/*.bz2 diff --git a/anaconda/gptsync/gptsync.c b/anaconda/gptsync/gptsync.c index 3ad26bf..94c37eb 100644 --- a/anaconda/gptsync/gptsync.c +++ b/anaconda/gptsync/gptsync.c @@ -222,7 +222,6 @@ static UINTN analyze(VOID) UINTN i, k, iter, count_active, detected_parttype; CHARN *fsname; UINT64 min_start_lba; - UINTN status; BOOLEAN have_esp; new_mbr_part_count = 0; @@ -237,7 +236,7 @@ static UINTN analyze(VOID) gpt_parts[i].mbr_type = gpt_parts[i].gpt_parttype->mbr_type; if (gpt_parts[i].gpt_parttype->kind == GPT_KIND_BASIC_DATA) { // Basic Data: need to look at data in the partition - status = detect_mbrtype_fs(gpt_parts[i].start_lba, &detected_parttype, &fsname); + detect_mbrtype_fs(gpt_parts[i].start_lba, &detected_parttype, &fsname); if (detected_parttype) gpt_parts[i].mbr_type = detected_parttype; else @@ -245,7 +244,7 @@ static UINTN analyze(VOID) } else if (gpt_parts[i].mbr_type == 0xef) { // EFI System Partition: GNU parted can put this on any partition, // need to detect file systems - status = detect_mbrtype_fs(gpt_parts[i].start_lba, &detected_parttype, &fsname); + detect_mbrtype_fs(gpt_parts[i].start_lba, &detected_parttype, &fsname); if (!have_esp && (detected_parttype == 0x01 || detected_parttype == 0x0e || detected_parttype == 0x0c)) ; // seems to be a legitimate ESP, don't change else if (detected_parttype) diff --git a/anaconda/gptsync/os_unix.c b/anaconda/gptsync/os_unix.c index b43685b..acf32f9 100644 --- a/anaconda/gptsync/os_unix.c +++ b/anaconda/gptsync/os_unix.c @@ -185,7 +185,6 @@ int main(int argc, char *argv[]) char *filename; struct stat sb; int filekind; - UINT64 filesize; char *reason; int status; @@ -207,10 +206,9 @@ int main(int argc, char *argv[]) } filekind = 0; - filesize = 0; reason = NULL; if (S_ISREG(sb.st_mode)) - filesize = sb.st_size; + filekind = 0; else if (S_ISBLK(sb.st_mode)) filekind = 1; else if (S_ISCHR(sb.st_mode)) diff --git a/anaconda/gui.py b/anaconda/gui.py index 6673888..2572ec9 100755 --- a/anaconda/gui.py +++ b/anaconda/gui.py @@ -604,6 +604,8 @@ class InstallKeyWindow: class luksPassphraseWindow: def __init__(self, passphrase=None, preexist = False, parent = None): + def ok(*args): + self.win.response(gtk.RESPONSE_OK) luksxml = gtk.glade.XML(findGladeFile("lukspassphrase.glade"), domain="anaconda", root="luksPassphraseDialog") @@ -637,6 +639,7 @@ class luksPassphraseWindow: if parent: self.win.set_transient_for(parent) + self.confirmEntry.connect('activate', ok) addFrame(self.win) def run(self): @@ -1432,7 +1435,8 @@ class InstallControlWindow: if ics.getGrabNext(): self.mainxml.get_widget("nextButton").grab_focus() - self.mainxml.get_widget("nextButton").set_flags(gtk.HAS_DEFAULT) + self.mainxml.get_widget("nextButton").set_flags(gtk.CAN_DEFAULT) + self.mainxml.get_widget("nextButton").grab_default() def __init__ (self, anaconda): self.reloadRcQueued = 0 diff --git a/anaconda/installclass.py b/anaconda/installclass.py index bcf03e4..b6e784d 100644 --- a/anaconda/installclass.py +++ b/anaconda/installclass.py @@ -176,9 +176,7 @@ class BaseInstallClass(object): return AnacondaBackend def setDefaultPartitioning(self, storage, platform): - autorequests = [PartSpec(mountpoint="/boot", fstype=storage.defaultBootFSType, - size=512, maxSize=2*1024, grow=False, asVol=False), - PartSpec(mountpoint="/", fstype=storage.defaultFSType, + autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType, size=1024, grow=True, asVol=True, requiredSpace=50*1024)] bootreq = platform.setDefaultPartitioning() diff --git a/anaconda/installclasses/qubes.py b/anaconda/installclasses/qubes.py index 896b22b..69ad3bb 100644 --- a/anaconda/installclasses/qubes.py +++ b/anaconda/installclasses/qubes.py @@ -91,7 +91,7 @@ class InstallClass(BaseInstallClass): # First disable all the useless services... whitelisted = ['functions', 'killall', 'halt', 'single', 'rsyslog', 'haldaemon', 'messagebus', 'xenstored', 'xend', 'xenconsoled', 'firstboot', - 'qubes_core', 'qubes_netvm'] + 'qubes_core', 'qubes_netvm', 'qubes_setupdvm'] for file in os.listdir(anaconda.rootPath + '/etc/init.d'): if not file in whitelisted: diff --git a/anaconda/isys/eddsupport.c b/anaconda/isys/eddsupport.c index c50278e..786e1f3 100644 --- a/anaconda/isys/eddsupport.c +++ b/anaconda/isys/eddsupport.c @@ -149,7 +149,7 @@ static int mapBiosDisks(struct device** devices,const char *path) { char * sigFileName; uint32_t mbrSig, biosNum, currentSig; struct device **currentDev, **foundDisk; - int i, rc, ret, dm_nr, highest_dm; + int i, rc, dm_nr, highest_dm; dirHandle = opendir(path); if(!dirHandle){ @@ -173,7 +173,7 @@ static int mapBiosDisks(struct device** devices,const char *path) { if(!strncmp(entry->d_name,".",1) || !strncmp(entry->d_name,"..",2)) { continue; } - ret = sscanf((entry->d_name+9), "%x", &biosNum); + sscanf((entry->d_name+9), "%x", &biosNum); sigFileName = malloc(strlen(path) + strlen(entry->d_name) + 20); sprintf(sigFileName, "%s/%s/%s", path, entry->d_name, SIG_FILE); @@ -332,6 +332,8 @@ char * getBiosDisk(char *biosStr) { return NULL; ret = sscanf(biosStr,"%x",&biosNum); + if (!ret) + return NULL; disk = lookupHashItem(mbrSigToName, biosNum); if (disk) return disk->diskname; diff --git a/anaconda/isys/uncpio.c b/anaconda/isys/uncpio.c index 171eb6b..c8539bb 100644 --- a/anaconda/isys/uncpio.c +++ b/anaconda/isys/uncpio.c @@ -137,13 +137,12 @@ static inline int padoutfd(struct ourfd * fd, size_t * where, int modulo) { static int strntoul(const char * str, char ** endptr, int base, int num) { char * buf, * end; - unsigned long ret; buf = alloca(num + 1); strncpy(buf, str, num); buf[num] = '\0'; - ret = strtoul(buf, &end, base); + strtoul(buf, &end, base); if (*end) *endptr = (char *)(str + (end - buf)); /* XXX discards const */ else @@ -491,7 +490,6 @@ int myCpioInstallArchive(gzFile stream, struct cpioFileMapping * mappings, int linkNum = 0; struct cpioFileMapping * map = NULL; struct cpioFileMapping needle; - mode_t cpioMode; int olderr; struct cpioCallbackInfo cbInfo; struct hardLink * links = NULL; @@ -523,8 +521,6 @@ int myCpioInstallArchive(gzFile stream, struct cpioFileMapping * mappings, if (mappings && !map) { eatBytes(&fd, ch.size); } else { - cpioMode = ch.mode; - if (map) { if (map->mapFlags & CPIO_MAP_PATH) { free(ch.path); diff --git a/anaconda/loader/driverdisk.c b/anaconda/loader/driverdisk.c index 1526611..3790b23 100644 --- a/anaconda/loader/driverdisk.c +++ b/anaconda/loader/driverdisk.c @@ -276,7 +276,7 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) { struct moduleBallLocation * location; struct stat sb; static int disknum = 0; - int fd, ret; + int fd; /* check for new version */ sprintf(file, "%s/rhdd3", mntpt); @@ -288,7 +288,7 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) { title = malloc(sb.st_size + 1); fd = open(file, O_RDONLY); - ret = read(fd, title, sb.st_size); + read(fd, title, sb.st_size); if (title[sb.st_size - 1] == '\n') sb.st_size--; title[sb.st_size] = '\0'; diff --git a/anaconda/loader/driverselect.c b/anaconda/loader/driverselect.c index f9379f0..108ee29 100644 --- a/anaconda/loader/driverselect.c +++ b/anaconda/loader/driverselect.c @@ -121,7 +121,6 @@ static int getManualModuleArgs(struct moduleInfo * mod, gchar *** moduleArgs) { int chooseManualDriver(int class, struct loaderData_s *loaderData) { int i, numSorted, num = 0, done = 0; - enum driverMajor type; struct sortModuleList * sortedOrder; char giveArgs = ' '; gchar **moduleArgs = NULL; @@ -131,13 +130,6 @@ int chooseManualDriver(int class, struct loaderData_s *loaderData) { newtGrid grid, buttons; struct newtExitStruct es; - if (class == DEVICE_NETWORK) - type = DRIVER_NET; - else if (class == DEVICE_DISK || class == DEVICE_CDROM) - type = DRIVER_SCSI; - else - type = DRIVER_ANY; - do { sortedOrder = malloc(sizeof(*sortedOrder) * modInfo->numModules); numSorted = 0; diff --git a/anaconda/loader/fwloader.c b/anaconda/loader/fwloader.c index a91ff6b..2faaa78 100644 --- a/anaconda/loader/fwloader.c +++ b/anaconda/loader/fwloader.c @@ -80,7 +80,7 @@ static inline int set_fd_coe(int fd, int enable) static int open_uevent_socket(struct fw_loader *fwl) { - int fd, rc; + int fd; struct sockaddr_nl sa; fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT); @@ -102,14 +102,14 @@ static int open_uevent_socket(struct fw_loader *fwl) fd = open("/proc/sys/kernel/hotplug", O_RDWR); if (fd >= 0) { - rc = ftruncate(fd, 0); - rc = write(fd, "\n", 1); + ftruncate(fd, 0); + write(fd, "\n", 1); close(fd); } fd = open("/sys/class/firmware/timeout", O_RDWR); if (fd >= 0) { - rc = write(fd, "10", 2); + write(fd, "10", 2); close(fd); } @@ -128,7 +128,6 @@ static void kill_hotplug_signal(int signum) static int daemonize(struct fw_loader *fwl) { int fd; - int rc; signal(SIGTERM, kill_hotplug_signal); signal(SIGSEGV, loaderSegvHandler); @@ -142,11 +141,11 @@ static int daemonize(struct fw_loader *fwl) sigemptyset(&fwl->sigmask); prctl(PR_SET_NAME, "hotplug", 0, 0, 0); - rc = chdir("/"); + chdir("/"); fd = open("/proc/self/oom_adj", O_RDWR); if (fd >= 0) { - rc = write(fd, "-17", 3); + write(fd, "-17", 3); close(fd); } @@ -342,7 +341,6 @@ fetcher(char *inpath, int outfd) size_t inlen; int count; int en = 0; - int rc; errno = 0; if (access(inpath, F_OK)) @@ -352,8 +350,8 @@ fetcher(char *inpath, int outfd) goto out; lseek(outfd, 0, SEEK_SET); - rc = ftruncate(outfd, 0); - rc = ftruncate(outfd, inlen); + ftruncate(outfd, 0); + ftruncate(outfd, inlen); count = 0; while (count < inlen) { diff --git a/anaconda/loader/init.c b/anaconda/loader/init.c index 8160ae3..e3ccf56 100644 --- a/anaconda/loader/init.c +++ b/anaconda/loader/init.c @@ -127,8 +127,7 @@ static void doExit(int result) } static void printstr(char * string) { - int ret; - ret = write(1, string, strlen(string)); + write(1, string, strlen(string)); } static void fatal_error(int usePerror) { @@ -143,7 +142,6 @@ static void fatal_error(int usePerror) { /* sets up and launches syslog */ static void startSyslog(void) { int conf_fd; - int ret; char addr[128]; char forwardtcp[] = "*.* @@"; @@ -156,9 +154,9 @@ static void startSyslog(void) { printf("syslog forwarding will not be enabled\n"); sleep(5); } else { - ret = write(conf_fd, forwardtcp, strlen(forwardtcp)); - ret = write(conf_fd, addr, strlen(addr)); - ret = write(conf_fd, "\n", 1); + write(conf_fd, forwardtcp, strlen(forwardtcp)); + write(conf_fd, addr, strlen(addr)); + write(conf_fd, "\n", 1); close(conf_fd); } } @@ -365,7 +363,7 @@ static void getSyslog(char *addr) { } static int getInitPid(void) { - int fd = 0, pid = -1, ret; + int fd = 0, pid = -1; char * buf = calloc(1, 10); fd = open("/var/run/init.pid", O_RDONLY); @@ -373,9 +371,9 @@ static int getInitPid(void) { fprintf(stderr, "Unable to find pid of init!!!\n"); return -1; } - ret = read(fd, buf, 9); + read(fd, buf, 9); close(fd); - ret = sscanf(buf, "%d", &pid); + sscanf(buf, "%d", &pid); return pid; } @@ -658,11 +656,10 @@ int main(int argc, char **argv) { tcsetattr(0, TCSANOW, &ts); } - int ret; - ret = sethostname("localhost.localdomain", 21); + sethostname("localhost.localdomain", 21); /* the default domainname (as of 2.0.35) is "(none)", which confuses glibc */ - ret = setdomainname("", 0); + setdomainname("", 0); printf("trying to remount root filesystem read write... "); if (mount("/", "/", "ext2", MS_REMOUNT | MS_MGC_VAL, NULL)) { @@ -691,10 +688,9 @@ int main(int argc, char **argv) { /* write out a pid file */ if ((fd = open("/var/run/init.pid", O_WRONLY|O_CREAT, 0644)) > 0) { char * buf = malloc(10); - int ret; snprintf(buf, 9, "%d", getpid()); - ret = write(fd, buf, strlen(buf)); + write(fd, buf, strlen(buf)); close(fd); free(buf); } else { @@ -759,9 +755,8 @@ int main(int argc, char **argv) { ctrl-alt-del handler */ if (count == strlen(buf) && (fd = open("/proc/sys/kernel/ctrl-alt-del", O_WRONLY)) != -1) { - int ret; - ret = write(fd, "0", 1); + write(fd, "0", 1); close(fd); } } diff --git a/anaconda/loader/loader.c b/anaconda/loader/loader.c index a601f0f..fea4b3c 100644 --- a/anaconda/loader/loader.c +++ b/anaconda/loader/loader.c @@ -1660,7 +1660,6 @@ static int manualDeviceCheck(struct loaderData_s *loaderData) { * with a '/' */ static void migrate_runtime_directory(char * dirname) { char * runtimedir; - int ret; checked_asprintf(&runtimedir, "/mnt/runtime%s", dirname); @@ -1670,10 +1669,10 @@ static void migrate_runtime_directory(char * dirname) { checked_asprintf(&olddir, "%s_old", dirname); - ret = rename(dirname, olddir); + rename(dirname, olddir); free(olddir); } - ret = symlink(runtimedir, dirname); + symlink(runtimedir, dirname); } free(runtimedir); } @@ -1832,7 +1831,7 @@ static void loadScsiDhModules(void) } int main(int argc, char ** argv) { - int rc, ret, pid, status; + int rc, pid, status; struct stat sb; struct serial_struct si; @@ -2128,7 +2127,7 @@ int main(int argc, char ** argv) { migrate_runtime_directory("/usr"); migrate_runtime_directory("/lib"); migrate_runtime_directory("/lib64"); - ret = symlink("/mnt/runtime/etc/selinux", "/etc/selinux"); + symlink("/mnt/runtime/etc/selinux", "/etc/selinux"); copyDirectory("/mnt/runtime/etc","/etc", NULL, copyErrorFn); copyDirectory("/mnt/runtime/var","/var", NULL, copyErrorFn); @@ -2216,11 +2215,11 @@ int main(int argc, char ** argv) { if (strncmp(url, "ftp:", 4)) { *argptr++ = url; } else { - int fd, ret; + int fd; fd = open("/tmp/ftp-stage2", O_CREAT | O_TRUNC | O_RDWR, 0600); - ret = write(fd, url, strlen(url)); - ret = write(fd, "\r", 1); + write(fd, url, strlen(url)); + write(fd, "\r", 1); close(fd); *argptr++ = "@/tmp/ftp-stage2"; } @@ -2315,11 +2314,11 @@ int main(int argc, char ** argv) { if (strncmp(loaderData.instRepo, "ftp:", 4)) { *argptr++ = loaderData.instRepo; } else { - int fd, ret; + int fd; fd = open("/tmp/ftp-repo", O_CREAT | O_TRUNC | O_RDWR, 0600); - ret = write(fd, loaderData.instRepo, strlen(loaderData.instRepo)); - ret = write(fd, "\r", 1); + write(fd, loaderData.instRepo, strlen(loaderData.instRepo)); + write(fd, "\r", 1); close(fd); *argptr++ = "@/tmp/ftp-repo"; } @@ -2331,15 +2330,15 @@ int main(int argc, char ** argv) { *argptr++ = strdup(loaderData.proxy); if (loaderData.proxyUser && strcmp(loaderData.proxyUser, "")) { - int fd, ret; + int fd; fd = open("/tmp/proxy", O_CREAT|O_TRUNC|O_RDWR, 0600); - ret = write(fd, loaderData.proxyUser, strlen(loaderData.proxyUser)); - ret = write(fd, "\r\n", 2); + write(fd, loaderData.proxyUser, strlen(loaderData.proxyUser)); + write(fd, "\r\n", 2); if (loaderData.proxyPassword && strcmp(loaderData.proxyPassword, "")) { - ret = write(fd, loaderData.proxyPassword, strlen(loaderData.proxyPassword)); - ret = write(fd, "\r\n", 2); + write(fd, loaderData.proxyPassword, strlen(loaderData.proxyPassword)); + write(fd, "\r\n", 2); } close(fd); diff --git a/anaconda/loader/moduleinfo.c b/anaconda/loader/moduleinfo.c index 2e0ab77..61d1681 100644 --- a/anaconda/loader/moduleinfo.c +++ b/anaconda/loader/moduleinfo.c @@ -93,7 +93,6 @@ int readModuleInfo(const char * filename, moduleInfoSet mis, int fd, isIndented; char * buf, * start, * next = NULL, * chptr; struct stat sb; - char oldch; struct moduleInfo * nextModule; int modulesAlloced; int i; @@ -223,7 +222,6 @@ int readModuleInfo(const char * filename, moduleInfoSet mis, chptr = start; while (!isspace(*chptr) && *chptr) chptr++; if (*chptr) { - oldch = *chptr; *chptr = '\0'; nextModule->args[nextModule->numArgs].arg = strdup(start); diff --git a/anaconda/loader/modules.c b/anaconda/loader/modules.c index 07f781a..a7b58f7 100644 --- a/anaconda/loader/modules.c +++ b/anaconda/loader/modules.c @@ -363,7 +363,6 @@ void loadKickstartModule(struct loaderData_s * loaderData, gchar *opts = NULL; gchar *module = NULL; gchar **args = NULL, **remaining = NULL; - gboolean rc; GOptionContext *optCon = g_option_context_new(NULL); GError *optErr = NULL; GOptionEntry ksDeviceOptions[] = { @@ -404,7 +403,7 @@ void loadKickstartModule(struct loaderData_s * loaderData, args = g_strsplit(opts, " ", 0); } - rc = mlLoadModule(module, args); + mlLoadModule(module, args); g_strfreev(args); return; } diff --git a/anaconda/loader/shutdown.c b/anaconda/loader/shutdown.c index 3b481f2..c0dc46b 100644 --- a/anaconda/loader/shutdown.c +++ b/anaconda/loader/shutdown.c @@ -49,7 +49,6 @@ static void performTerminations(void) { } static void performUnmounts(void) { - int ignore; printf("disabling swap...\n"); disableSwap(); @@ -58,7 +57,7 @@ static void performUnmounts(void) { unmountFilesystems(); printf("waiting for mdraid sets to become clean...\n"); - ignore = system("/sbin/mdadm --wait-clean --scan"); + system("/sbin/mdadm --wait-clean --scan"); } static void performReboot(reboot_action rebootAction) { diff --git a/anaconda/loader/telnet.c b/anaconda/loader/telnet.c index a2c0b20..b6b45a6 100644 --- a/anaconda/loader/telnet.c +++ b/anaconda/loader/telnet.c @@ -78,31 +78,30 @@ telnet_negotiate(int socket, char ** term_type_ptr, int * heightPtr, IAC DO NAWS IAC SB TERMINAL_TYPE "\x01" IAC SE ; - int ret; - ret = write(socket, request, sizeof(request)-1); + write(socket, request, sizeof(request)-1); /* Read from the terminal until we get the terminal type. This will do bad things if the client doesn't send the terminal type, but those clients have existed for aeons (right?) */ do { - ret = read(socket, &ch, 1); + read(socket, &ch, 1); if (ch != '\xff') { abort(); } - ret = read(socket, &ch, 1); /* command */ + read(socket, &ch, 1); /* command */ if (ch != '\xfa') { - ret = read(socket, &ch, 1); /* verb */ + read(socket, &ch, 1); /* verb */ continue; } - ret = read(socket, &ch, 1); /* suboption */ + read(socket, &ch, 1); /* suboption */ if (ch == '\x18') { state = ST_TERMTYPE; - ret = read(socket, &ch, 1); /* should be 0x0! */ + read(socket, &ch, 1); /* should be 0x0! */ done = 1; } else if (ch == '\x1f') { state = ST_WINDOWSIZE; @@ -110,7 +109,7 @@ telnet_negotiate(int socket, char ** term_type_ptr, int * heightPtr, state = ST_NONE;; } - ret = read(socket, &ch, 1); /* data */ + read(socket, &ch, 1); /* data */ while (ch != '\xff') { if (state == ST_TERMTYPE) { if (termAlloced == termLength) { @@ -124,10 +123,10 @@ telnet_negotiate(int socket, char ** term_type_ptr, int * heightPtr, *sizePtr++ = ch; } - ret = read(socket, &ch, 1); /* data */ + read(socket, &ch, 1); /* data */ } - ret = read(socket, &ch, 1); /* should be a SE */ + read(socket, &ch, 1); /* should be a SE */ } while (!done); @@ -254,7 +253,6 @@ void telnet_send_output(int sock, char *data, int len) { char *s, *d; /* source, destination */ char *buf; - int ret; buf = alloca((len*2)+1); /* max necessary size */ @@ -269,5 +267,5 @@ telnet_send_output(int sock, char *data, int len) { } /* now send it... */ - ret = write(sock, buf, len); + write(sock, buf, len); } diff --git a/anaconda/loader/telnetd.c b/anaconda/loader/telnetd.c index 7616181..fc47a14 100644 --- a/anaconda/loader/telnetd.c +++ b/anaconda/loader/telnetd.c @@ -169,7 +169,6 @@ int beTelnet(void) { } if (fds[1].revents) { - int ret; i = read(conn, buf, sizeof(buf)); /* connection went away */ @@ -177,7 +176,7 @@ int beTelnet(void) { break; i = telnet_process_input(&ts, buf, i); - ret = write(masterFd, buf, i); + write(masterFd, buf, i); #ifdef DEBUG_TELNET { int j; diff --git a/anaconda/loader/undomounts.c b/anaconda/loader/undomounts.c index af5caaa..fc75d04 100644 --- a/anaconda/loader/undomounts.c +++ b/anaconda/loader/undomounts.c @@ -52,9 +52,8 @@ struct unmountInfo { void undoLoop(struct unmountInfo * fs, int numFs, int this); static void printstr(char * string) { - int ret; - ret = write(1, string, strlen(string)); + write(1, string, strlen(string)); } void undoMount(struct unmountInfo * fs, int numFs, int this) { @@ -127,7 +126,6 @@ void unmountFilesystems(void) { int numFilesystems = 0; int i; struct loop_info li; - char * device; struct stat sb; fd = open("/proc/mounts", O_RDONLY, 0); @@ -145,7 +143,6 @@ void unmountFilesystems(void) { chptr = buf; while (*chptr) { - device = chptr; while (*chptr != ' ') chptr++; *chptr++ = '\0'; start = chptr; diff --git a/anaconda/scripts/buildinstall b/anaconda/scripts/buildinstall index 3a75d9e..38cf7ba 100755 --- a/anaconda/scripts/buildinstall +++ b/anaconda/scripts/buildinstall @@ -202,6 +202,7 @@ else BASEARCH=`python -c "import rpmUtils.arch; \ print rpmUtils.arch.getBaseArch(myarch=rpmUtils.arch.getCanonArch(skipRpmPlatform = True));"` yumdownloader -c $yumconf anaconda || exit 1 + rpm --checksig anaconda*rpm | grep -v pgp && exit 1 rpm2cpio anaconda*rpm | cpio --quiet -iumd './usr*' rm -f anaconda*rpm popd diff --git a/anaconda/scripts/mk-images b/anaconda/scripts/mk-images index 5979ece..04e42c3 100755 --- a/anaconda/scripts/mk-images +++ b/anaconda/scripts/mk-images @@ -1077,6 +1077,7 @@ for KERNELARCH in $arches; do yumdownloader -c $yumconf --archlist=$KERNELARCH $kpackage kpackage="$kpackage.rpm" + rpm --checksig $kpackage.rpm | grep -v pgp && exit 1 if [ ! -f "$kpackage" ]; then echo "kernel ($kernelvers) doesn't exist for $KERNELARCH. skipping" continue @@ -1101,12 +1102,14 @@ for KERNELARCH in $arches; do # expand out any available firmware too for p in $(repoquery -c $yumconf '*firmware*') ; do yumdownloader -c $yumconf $p + rpm --checksig *firmware*.rpm | grep -v pgp && exit 1 rpm2cpio *firmware*.rpm | (cd $KERNELROOT; cpio --quiet -iumd) rm -f *firmware*.rpm done # and get XEN Hypervisor for p in $(repoquery -c $yumconf 'xen-hypervisor') ; do yumdownloader -c $yumconf $p + rpm --checksig xen-hypervisor*.rpm | grep -v pgp && exit 1 rpm2cpio xen-hypervisor*.rpm | (cd $KERNELROOT; cpio --quiet -iumd) rm -f xen-hypervisor*.rpm done diff --git a/anaconda/scripts/mk-images.efi b/anaconda/scripts/mk-images.efi index 2c9ce0f..d672f49 100644 --- a/anaconda/scripts/mk-images.efi +++ b/anaconda/scripts/mk-images.efi @@ -169,6 +169,7 @@ prepareEfiTree() { ydcmd="yumdownloader -c $yumconf $grubpkg" echo "(grubpkg) $ydcmd" $ydcmd + rpm --checksig $grubpkg.rpm | grep -v pgp && exit 1 rpm2cpio $grubpkg.rpm | (cd $KERNELROOT; cpio --quiet -iumd) cp -av $KERNELROOT/boot/efi/EFI/redhat/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi @@ -195,6 +196,7 @@ prepareEfiTree() { ydcmd="yumdownloader -c ${yumconf} ${artpkg}" echo "(artpkg) $ydcmd" $ydcmd + rpm --checksig ${artpkg}.rpm | grep -v pgp && exit 1 rpm2cpio ${artpkg}.rpm | (cd $KERNELROOT; cpio --quiet -iumd) cp -av $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/$SPLASHPATH diff --git a/anaconda/users.py b/anaconda/users.py index 1748dfd..117bf29 100644 --- a/anaconda/users.py +++ b/anaconda/users.py @@ -252,10 +252,11 @@ class Users: def setUserPassword(self, username, password, isCrypted, lock, algo=None): user = self.admin.lookupUserByName(username) - if isCrypted: - self.admin.setpassUser(user, password, True) - else: - self.admin.setpassUser(user, cryptPassword(password, algo=algo), True) + if password: + if isCrypted: + self.admin.setpassUser(user, password, True) + else: + self.admin.setpassUser(user, cryptPassword(password, algo=algo), True) if lock: self.admin.lockUser(user) diff --git a/anaconda/utils/mapshdr.c b/anaconda/utils/mapshdr.c index f2209c7..894cd72 100644 --- a/anaconda/utils/mapshdr.c +++ b/anaconda/utils/mapshdr.c @@ -29,13 +29,13 @@ int main(int argc, char ** argv) { struct kmapHeader h; struct kmapInfo info; - int i, x; + int i; struct stat sb; char * chptr; h.magic = KMAP_MAGIC; h.numEntries = argc - 1; - x = write(1, &h, sizeof(h)); + write(1, &h, sizeof(h)); for (i = 1; i < argc; i++) { if (stat(argv[i], &sb)) { @@ -52,7 +52,7 @@ int main(int argc, char ** argv) { *chptr = '\0'; info.size = sb.st_size; - x = write(1, &info, sizeof(info)); + write(1, &info, sizeof(info)); } return 0; diff --git a/anaconda/xutils.c b/anaconda/xutils.c index 372ffca..6e49798 100644 --- a/anaconda/xutils.c +++ b/anaconda/xutils.c @@ -262,7 +262,5 @@ getXatom(PyObject *s, PyObject *args) void initxutils () { - PyObject * d; - - d = Py_InitModule ("xutils", xutilsMethods); + Py_InitModule ("xutils", xutilsMethods); } diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg index e7f146a..645fad3 100644 --- a/conf/qubes-kickstart.cfg +++ b/conf/qubes-kickstart.cfg @@ -11,7 +11,6 @@ dracut-* # X and drivers @base-x @fonts -@hardware-support # Desktop Packages @kde-desktop --nodefaults -kde* @@ -23,7 +22,6 @@ qubes-core-dom0 qubes-gui-dom0 qubes-manager qubes-template-fedora-14-x64 -knetworkmanager -smolt-firstboot -smolt # Keep dap off the install media, makes Eng & Sci show up diff --git a/qubes-logos/plymouth/qubes/logo.png b/qubes-logos/plymouth/qubes/logo.png new file mode 100644 index 0000000..996640c Binary files /dev/null and b/qubes-logos/plymouth/qubes/logo.png differ diff --git a/qubes-logos/plymouth/qubes/qubes.script b/qubes-logos/plymouth/qubes/qubes.script index fac3960..175fc70 100644 --- a/qubes-logos/plymouth/qubes/qubes.script +++ b/qubes-logos/plymouth/qubes/qubes.script @@ -3,7 +3,7 @@ Window.SetBackgroundTopColor(0.234, 0.43, 0.705); Window.SetBackgroundBottomColor(0.16, 0.25, 0.44); -logo.image = Image("special://logo"); +logo.image = Image("logo.png"); logo.sprite = Sprite(logo.image); logo.opacity_angle = 0; diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec index 0b28eea..95d5dea 100644 --- a/qubes-logos/qubes-logos.spec +++ b/qubes-logos/qubes-logos.spec @@ -18,6 +18,8 @@ Conflicts: redhat-artwork <= 5.0.5 # For _kde4_appsdir macro: BuildRequires: kde-filesystem Requires: plymouth-plugin-script +# For plymouth-set-default-theme +Requires: plymouth diff --git a/revisor/F13-buildinstall b/revisor/F13-buildinstall index 8bb3bef..b7602e4 100755 --- a/revisor/F13-buildinstall +++ b/revisor/F13-buildinstall @@ -213,6 +213,7 @@ else BASEARCH=`python -c "import rpmUtils.arch; \ print rpmUtils.arch.getBaseArch(myarch=rpmUtils.arch.getCanonArch(skipRpmPlatform = True));"` yumdownloader -c $yumconf anaconda || exit 1 + rpm --checksig anaconda*rpm | grep -v pgp && exit 1 rpm2cpio anaconda*rpm | cpio --quiet -iumd './usr*' rm -f anaconda*rpm popd diff --git a/yum/qubes-dom0/rpm/packages_list b/yum/qubes-dom0/rpm/packages_list new file mode 100644 index 0000000..9f2f238 --- /dev/null +++ b/yum/qubes-dom0/rpm/packages_list @@ -0,0 +1,13 @@ +kernel +qubes-core-dom0 +qubes-core-dom0-vaio-fixes +qubes-gui-dom0 +qubes-manager +qubes-template-fedora-14-x64 +xen +xen-debuginfo +xen-doc +xen-hypervisor +xen-libs +xen-runtime +xen-licenses