projects / packages / anaconda.git / blame
| Commit | Line | Data |
|---|---|---|
| 0327455d ER |
1 | --- anaconda-11.0.5/anaconda 2006-06-06 20:38:29.731167253 +0300 |
| 2 | +++ anaconda-11.0.5-antihackery/anaconda 2006-06-06 20:26:53.335544911 +0300 | |
| 3 | @@ -1029,28 +1029,11 @@ | |
| 4 | addpid(child) | |
| 5 | os.kill(child, signal.SIGCONT) | |
| 6 | ||
| 7 | - | |
| 8 | -# setup links required for all install types | |
| 9 | -for i in ( "services", "protocol", "nsswitch.conf", "joe", "selinux"): | |
| 10 | - try: | |
| 11 | - os.symlink ("../mnt/runtime/etc/" + i, "/etc/" + i) | |
| 12 | - except: | |
| 13 | - pass | |
| 14 | - | |
| 15 | # | |
| 16 | # setup links required by graphical mode if installing and verify display mode | |
| 17 | # | |
| 18 | if (display_mode == 'g'): | |
| 19 | stdoutLog.info (_("Starting graphical installation...")) | |
| 20 | - if not flags.test and flags.setupFilesystems: | |
| 21 | - for i in ( "imrc", "im_palette.pal", "gtk-2.0", "pango", "fonts", | |
| 22 | - "fb.modes"): | |
| 23 | - try: | |
| 24 | - if os.path.exists("/mnt/runtime/etc/%s" %(i,)): | |
| 25 | - os.symlink ("../mnt/runtime/etc/" + i, "/etc/" + i) | |
| 26 | - except: | |
| 27 | - pass | |
| 28 | - | |
| 29 | try: | |
| 30 | from gui import InstallInterface | |
| 31 | except Exception, e: | |
| 32 | --- anaconda-11.0.5/yuminstall.py 2006-06-06 20:38:29.721167028 +0300 | |
| 33 | +++ anaconda-11.0.5-antihackery/yuminstall.py 2006-06-06 20:37:06.879307087 +0300 | |
| 34 | @@ -879,25 +879,6 @@ | |
| 35 | self.initLog(id, instPath) | |
| 36 | ||
| 37 | if flags.setupFilesystems: | |
| 38 | - # setup /etc/rpm/platform for the post-install environment | |
| 39 | - iutil.writeRpmPlatform(instPath) | |
| 40 | - | |
| 41 | - try: | |
| 42 | - # FIXME: making the /var/lib/rpm symlink here is a hack to | |
| 43 | - # workaround db->close() errors from rpm | |
| 44 | - iutil.mkdirChain("/var/lib") | |
| 45 | - for path in ("/var/tmp", "/var/lib/rpm"): | |
| 46 | - if os.path.exists(path) and not os.path.islink(path): | |
| 47 | - iutil.rmrf(path) | |
| 48 | - if not os.path.islink(path): | |
| 49 | - os.symlink("/mnt/sysimage/%s" %(path,), "%s" %(path,)) | |
| 50 | - else: | |
| 51 | - log.warning("%s already exists as a symlink to %s" %(path, os.readlink(path),)) | |
| 52 | - except Exception, e: | |
| 53 | - # how this could happen isn't entirely clear; log it in case | |
| 54 | - # it does and causes problems later | |
| 55 | - log.error("error creating symlink, continuing anyway: %s" %(e,)) | |
| 56 | - | |
| 57 | # SELinux hackery (#121369) | |
| 58 | if flags.selinux: | |
| 59 | try: |