Author: fehr
Date: Mon Sep 10 13:06:33 2007
New Revision: 40831
URL: http://svn.opensuse.org/viewcvs/yast?rev=40831&view=rev
Log:
change windows detection to cover also Vista (#307802)
Modified:
trunk/storage/libstorage/src/Storage.cc
trunk/storage/package/yast2-storage.changes
Modified: trunk/storage/libstorage/src/Storage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=40831&r1=40830&r2=40831&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Mon Sep 10 13:06:33 2007
@@ -5823,12 +5823,25 @@
string mdir = tmpDir() + "/tmp_mp";
unlink( mdir.c_str() );
rmdir( mdir.c_str() );
+ string save_opt;
+ string cur_opt;
+ if( vol->getFs()==NTFS )
+ {
+ save_opt = vol->getFstabOption();
+ cur_opt = save_opt;
+ if( !cur_opt.empty() )
+ cur_opt += ",";
+ cur_opt += "show_sys_files";
+ vol->changeFstabOptions( cur_opt );
+ }
if( vol->getFs()!=FSUNKNOWN && mkdir( mdir.c_str(), 0700 )==0 &&
mountDev( device, mdir ) )
{
needUmount = true;
mp = mdir;
}
+ if( vol->getFs()==NTFS )
+ vol->changeFstabOptions( save_opt );
}
else
mp = vol->getMount();
@@ -5875,7 +5888,8 @@
}
win = false;
const char * files[] = { "boot.ini", "msdos.sys", "io.sys",
- "config.sys", "MSDOS.SYS", "IO.SYS" };
+ "config.sys", "MSDOS.SYS", "IO.SYS",
+ "bootmgr", "$Boot" };
string f;
unsigned i=0;
while( !win && i