Hello community, here is the log from the commit of package linuxrc checked in at Tue Mar 27 01:42:52 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-03-16 15:05:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-03-26 17:08:52.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Mar 26 17:08:48 CEST 2007 - snwint@suse.de + +- new vfat fs detection (#257117) +- added ext4dev support +- s390: ask for installation display when netsetup=1 (bug #253695) + +------------------------------------------------------------------- Old: ---- linuxrc-2.1.23.tar.bz2 New: ---- linuxrc-2.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Z26888/_old 2007-03-27 01:42:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Z26888/_new 2007-03-27 01:42:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.1.23) +# spec file for package linuxrc (Version 2.1.24) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 2.1.23 +Version: 2.1.24 Release: 1 -Source: linuxrc-2.1.23.tar.bz2 +Source: linuxrc-2.1.24.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,10 @@ %doc linuxrc.html %changelog +* Mon Mar 26 2007 - snwint@suse.de +- new vfat fs detection (#257117) +- added ext4dev support +- s390: ask for installation display when netsetup=1 (bug #253695) * Fri Mar 16 2007 - snwint@suse.de - accept 'BOOTIF' as alias to 'netdevice' - mls: bad tftp response overwrites the request (#242892) ++++++ linuxrc-2.1.23.tar.bz2 -> linuxrc-2.1.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/Changelog new/linuxrc-2.1.24/Changelog --- old/linuxrc-2.1.23/Changelog 2007-03-16 15:03:19.000000000 +0100 +++ new/linuxrc-2.1.24/Changelog 2007-03-26 17:08:07.000000000 +0200 @@ -1,3 +1,8 @@ +25/3/2007: v2.1.24 + - new vfat fs detection (#257117) + - added ext4dev support + - s390: ask for installation display when netsetup=1 (bug #253695) + 16/3/2007: v2.1.23 - accept 'BOOTIF' as alias to 'netdevice' - mls: bad tftp response overwrites the request (#242892) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/ext4 new/linuxrc-2.1.24/ext4 --- old/linuxrc-2.1.23/ext4 2007-02-15 18:42:59.000000000 +0100 +++ new/linuxrc-2.1.24/ext4 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -+static int probe_ext4(struct blkid_probe *probe, -+ struct blkid_magic *id __BLKID_ATTR((unused)), -+ unsigned char *buf) -+{ -+ struct ext2_super_block *es; -+ es = (struct ext2_super_block *)buf; -+ -+ /* Distinguish between jbd and ext2/3 fs */ -+ if (blkid_le32(es->s_feature_incompat) & -+ EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) -+ return -BLKID_ERR_PARAM; -+ -+ /* Distinguish between ext3 and ext2 */ -+ if (!(blkid_le32(es->s_feature_compat) & -+ EXT3_FEATURE_COMPAT_HAS_JOURNAL)) -+ return -BLKID_ERR_PARAM; -+ -+ /* Distinguish between ext4 and ext3 */ -+ if (!(blkid_le32(es->s_feature_incompat) & -+ EXT3_FEATURE_INCOMPAT_EXTENTS)) -+ return -BLKID_ERR_PARAM; -+ -+ get_ext2_info(probe->dev, buf); -+ -+ if ((es->s_feature_incompat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && -+ !uuid_is_null(es->s_journal_uuid)) -+ set_uuid(probe->dev, es->s_journal_uuid, "EXT_JOURNAL"); -+ -+ blkid_set_tag(probe->dev, "SEC_TYPE", "ext2", sizeof("ext2")); -+ -+ return 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/file.c new/linuxrc-2.1.24/file.c --- old/linuxrc-2.1.23/file.c 2007-03-06 16:56:13.000000000 +0100 +++ new/linuxrc-2.1.24/file.c 2007-03-26 17:07:52.000000000 +0200 @@ -1217,6 +1217,9 @@ else if(!strcmp(s, "netmask")) i = NS_NETMASK; else if(!strcmp(s, "gateway")) i = NS_GATEWAY; else if(!strcmp(s, "all")) i = NS_ALLIFS; +#if defined(__s390__) || defined(__s390x__) + else if(!strcmp(s, "display")) i = NS_DISPLAY; +#endif else if(!strncmp(s, "nameserver", sizeof "nameserver" - 1)) { i = NS_NAMESERVER; t = s + sizeof "nameserver" - 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/fstype.c new/linuxrc-2.1.24/fstype.c --- old/linuxrc-2.1.23/fstype.c 2006-11-06 16:47:29.000000000 +0100 +++ new/linuxrc-2.1.24/fstype.c 2007-03-26 16:23:24.000000000 +0200 @@ -166,6 +166,7 @@ struct fat_super_block fatsb; struct xfs_super_block xfsb; struct cramfs_super_block cramfssb; + unsigned char data[512]; } xsb; #ifdef ALL_TYPES struct ufs_super_block ufssb; @@ -223,24 +224,24 @@ else if(cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC || cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC_BIG) type = "cramfs"; - else if ((!strncmp(xsb.fatsb.s_os, "MSDOS", 5) || - !strncmp(xsb.fatsb.s_os, "MSWIN", 5) || - !strncmp(xsb.fatsb.s_os, "MTOOL", 5) || - !strncmp(xsb.fatsb.s_os, "IBM", 3) || - !strncmp(xsb.fatsb.s_os, "DRDOS", 5) || - !strncmp(xsb.fatsb.s_os, "SUSE", 4) || - !strncmp(xsb.fatsb.s_os, "mkdosfs", 7) || - !strncmp(xsb.fatsb.s_os, "kmkdosfs", 8) || - !strncmp(xsb.fatsb.s_os, "FreeDOS", 7) || - !strncmp(xsb.fatsb.s_os, "FDOS", 4) || - !strncmp(xsb.fatsb.s_os, "SYSLINUX", 8) || - /* Michal Svec: created by fdformat, old msdos utility for - formatting large (1.7) floppy disks. */ - !strncmp(xsb.fatsb.s_os, "CH-FOR18", 8)) - && (!strncmp(xsb.fatsb.s_fs, "FAT12 ", 8) || - !strncmp(xsb.fatsb.s_fs, "FAT16 ", 8) || - !strncmp(xsb.fatsb.s_fs2, "FAT32 ", 8))) - type = "vfat"; /* only guessing - might as well be fat or umsdos */ + else if( + xsb.data[0x1fe] == 0x55 && + xsb.data[0x1ff] == 0xaa && + xsb.data[0x0b] == 0 && /* bytes per sector, bits 0-7 */ + ( + ( /* FAT12/16 */ + xsb.data[0x26] == 0x29 && ( + !strncmp(xsb.fatsb.s_fs, "FAT12 ", 8) || + !strncmp(xsb.fatsb.s_fs, "FAT16 ", 8) + ) + ) || + ( /* FAT32 */ + xsb.data[0x42] == 0x29 && + !strncmp(xsb.fatsb.s_fs2, "FAT32 ", 8) + ) + ) + ) + type = "vfat"; } if(!type) { @@ -267,6 +268,9 @@ #endif if (!type) { + unsigned ntype = 0; + char *type_str[] = { "ext2", "ext3", "ext4dev" }; + /* block 1 */ if (lseek(fd, 1024, SEEK_SET) != 1024 || read(fd, (char *) &sb, sizeof(sb)) != sizeof(sb)) @@ -278,13 +282,20 @@ if (ext2magic(sb.e2s) == EXT2_SUPER_MAGIC || ext2magic(sb.e2s) == EXT2_PRE_02B_MAGIC || ext2magic(sb.e2s) == swapped(EXT2_SUPER_MAGIC)) { - type = "ext2"; + ntype = 2; /* maybe even ext3? */ if ((assemble4le(sb.e2s.s_feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && assemble4le(sb.e2s.s_journal_inum) != 0) - type = "ext3"; + ntype = 3; + + /* maybe ext4 */ + if((assemble4le(sb.e2s.s_feature_incompat) + & EXT4_FEATURE_INCOMPAT_EXTENTS) && ntype == 3) + ntype = 4; + + if(ntype) type = type_str[ntype - 2]; } else if (minixmagic(sb.ms) == MINIX_SUPER_MAGIC || diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/global.h new/linuxrc-2.1.24/global.h --- old/linuxrc-2.1.23/global.h 2007-03-06 16:55:16.000000000 +0100 +++ new/linuxrc-2.1.24/global.h 2007-03-26 17:07:52.000000000 +0200 @@ -232,8 +232,13 @@ #define NS_GATEWAY (1 << 4) #define NS_NAMESERVER (1 << 5) #define NS_ALLIFS (1 << 6) +#define NS_DISPLAY (1 << 7) +#if defined(__s390__) || defined(__s390x__) +#define NS_DEFAULT (NS_DHCP | NS_HOSTIP | NS_NETMASK | NS_GATEWAY | NS_NAMESERVER | NS_DISPLAY) +#else #define NS_DEFAULT (NS_DHCP | NS_HOSTIP | NS_NETMASK | NS_GATEWAY | NS_NAMESERVER) +#endif #define SPLASH_10 NULL #define SPLASH_20 "rlchange B" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/install.c new/linuxrc-2.1.24/install.c --- old/linuxrc-2.1.23/install.c 2006-11-16 14:06:39.000000000 +0100 +++ new/linuxrc-2.1.24/install.c 2007-03-26 17:07:52.000000000 +0200 @@ -778,13 +778,16 @@ if(config.manual) { if((rc = inst_choose_source())) return rc; -#if defined(__s390__) || defined(__s390x__) - if((rc = inst_choose_display())) return rc; -#endif } else { fprintf(stderr, "going for automatic install\n"); } + +#if defined(__s390__) || defined(__s390x__) + if(config.manual || (config.net.setup & NS_DISPLAY)) + if((rc = inst_choose_display())) return rc; +#endif + str_copy(&config.instsys, NULL); str_copy(&config.instsys2, NULL); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/linux_fs.h new/linuxrc-2.1.24/linux_fs.h --- old/linuxrc-2.1.23/linux_fs.h 2005-12-09 12:59:25.000000000 +0100 +++ new/linuxrc-2.1.24/linux_fs.h 2007-03-26 16:22:52.000000000 +0200 @@ -51,6 +51,7 @@ #define EXT2_PRE_02B_MAGIC 0xEF51 #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +#define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */ struct ext2_super_block { u_char s_dummy1[56]; u_char s_magic[2]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.23/VERSION new/linuxrc-2.1.24/VERSION --- old/linuxrc-2.1.23/VERSION 2007-03-16 15:04:49.000000000 +0100 +++ new/linuxrc-2.1.24/VERSION 2007-03-26 13:54:41.000000000 +0200 @@ -1 +1 @@ -2.1.23 +2.1.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org