1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
Index: glibc-2.19/sysdeps/generic/paths.h
===================================================================
--- glibc-2.19.orig/sysdeps/generic/paths.h
+++ glibc-2.19/sysdeps/generic/paths.h
@@ -33,43 +33,43 @@
#define _PATHS_H_
/* Default search path. */
-#define _PATH_DEFPATH "/usr/bin:/bin"
+#define _PATH_DEFPATH "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin"
/* All standard utilities path. */
#define _PATH_STDPATH \
- "/usr/bin:/bin:/usr/sbin:/sbin"
+ "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin"
-#define _PATH_BSHELL "/bin/sh"
+#define _PATH_BSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/sh"
#define _PATH_CONSOLE "/dev/console"
-#define _PATH_CSHELL "/bin/csh"
-#define _PATH_DEVDB "/var/run/dev.db"
+#define _PATH_CSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/csh"
+#define _PATH_DEVDB "@GENTOO_PORTAGE_EPREFIX@/var/run/dev.db"
#define _PATH_DEVNULL "/dev/null"
#define _PATH_DRUM "/dev/drum"
-#define _PATH_GSHADOW "/etc/gshadow"
+#define _PATH_GSHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/gshadow"
#define _PATH_KMEM "/dev/kmem"
-#define _PATH_LASTLOG "/var/log/lastlog"
+#define _PATH_LASTLOG "@GENTOO_PORTAGE_EPREFIX@/var/log/lastlog"
#define _PATH_MAILDIR "/var/mail"
-#define _PATH_MAN "/usr/share/man"
+#define _PATH_MAN "@GENTOO_PORTAGE_EPREFIX@/usr/share/man"
#define _PATH_MEM "/dev/mem"
-#define _PATH_MNTTAB "/etc/fstab"
-#define _PATH_MOUNTED "/var/run/mtab"
-#define _PATH_NOLOGIN "/etc/nologin"
-#define _PATH_PRESERVE "/var/lib"
-#define _PATH_RWHODIR "/var/spool/rwho"
-#define _PATH_SENDMAIL "/usr/sbin/sendmail"
-#define _PATH_SHADOW "/etc/shadow"
-#define _PATH_SHELLS "/etc/shells"
+#define _PATH_MNTTAB "@GENTOO_PORTAGE_EPREFIX@/etc/fstab"
+#define _PATH_MOUNTED "@GENTOO_PORTAGE_EPREFIX@/var/run/mtab"
+#define _PATH_NOLOGIN "@GENTOO_PORTAGE_EPREFIX@/etc/nologin"
+#define _PATH_PRESERVE "@GENTOO_PORTAGE_EPREFIX@/var/lib"
+#define _PATH_RWHODIR "@GENTOO_PORTAGE_EPREFIX@/var/spool/rwho"
+#define _PATH_SENDMAIL "@GENTOO_PORTAGE_EPREFIX@/usr/sbin/sendmail"
+#define _PATH_SHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/shadow"
+#define _PATH_SHELLS "@GENTOO_PORTAGE_EPREFIX@/etc/shells"
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/vmunix"
-#define _PATH_UTMP "/var/run/utmp"
-#define _PATH_UTMP_DB "/var/run/utmp.db"
-#define _PATH_VI "/usr/bin/vi"
+#define _PATH_UTMP "@GENTOO_PORTAGE_EPREFIX@/var/run/utmp"
+#define _PATH_UTMP_DB "@GENTOO_PORTAGE_EPREFIX@/var/run/utmp.db"
+#define _PATH_VI "@GENTOO_PORTAGE_EPREFIX@/usr/bin/vi"
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
#define _PATH_DEV "/dev/"
#define _PATH_TMP "/tmp/"
-#define _PATH_VARDB "/var/db/"
-#define _PATH_VARRUN "/var/run/"
+#define _PATH_VARDB "@GENTOO_PORTAGE_EPREFIX@/var/db/"
+#define _PATH_VARRUN "@GENTOO_PORTAGE_EPREFIX@/var/run/"
#define _PATH_VARTMP "/var/tmp/"
#endif /* !_PATHS_H_ */
Index: glibc-2.19/sysdeps/unix/sysv/linux/paths.h
===================================================================
--- glibc-2.19.orig/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.19/sysdeps/unix/sysv/linux/paths.h
@@ -33,43 +33,43 @@
#define _PATHS_H_
/* Default search path. */
-#define _PATH_DEFPATH "/usr/bin:/bin"
+#define _PATH_DEFPATH "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin"
/* All standard utilities path. */
#define _PATH_STDPATH \
- "/usr/bin:/bin:/usr/sbin:/sbin"
+ "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin"
-#define _PATH_BSHELL "/bin/sh"
+#define _PATH_BSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/sh"
#define _PATH_CONSOLE "/dev/console"
-#define _PATH_CSHELL "/bin/csh"
-#define _PATH_DEVDB "/var/run/dev.db"
+#define _PATH_CSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/csh"
+#define _PATH_DEVDB "@GENTOO_PORTAGE_EPREFIX@/var/run/dev.db"
#define _PATH_DEVNULL "/dev/null"
#define _PATH_DRUM "/dev/drum"
-#define _PATH_GSHADOW "/etc/gshadow"
+#define _PATH_GSHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/gshadow"
#define _PATH_KLOG "/proc/kmsg"
#define _PATH_KMEM "/dev/kmem"
#define _PATH_LASTLOG "/var/log/lastlog"
#define _PATH_MAILDIR "/var/mail"
-#define _PATH_MAN "/usr/share/man"
+#define _PATH_MAN "@GENTOO_PORTAGE_EPREFIX@/usr/share/man"
#define _PATH_MEM "/dev/mem"
-#define _PATH_MNTTAB "/etc/fstab"
-#define _PATH_MOUNTED "/etc/mtab"
-#define _PATH_NOLOGIN "/etc/nologin"
-#define _PATH_PRESERVE "/var/lib"
-#define _PATH_RWHODIR "/var/spool/rwho"
-#define _PATH_SENDMAIL "/usr/sbin/sendmail"
-#define _PATH_SHADOW "/etc/shadow"
-#define _PATH_SHELLS "/etc/shells"
+#define _PATH_MNTTAB "@GENTOO_PORTAGE_EPREFIX@/etc/fstab"
+#define _PATH_MOUNTED "@GENTOO_PORTAGE_EPREFIX@/etc/mtab"
+#define _PATH_NOLOGIN "@GENTOO_PORTAGE_EPREFIX@/etc/nologin"
+#define _PATH_PRESERVE "@GENTOO_PORTAGE_EPREFIX@/var/lib"
+#define _PATH_RWHODIR "@GENTOO_PORTAGE_EPREFIX@/var/spool/rwho"
+#define _PATH_SENDMAIL "@GENTOO_PORTAGE_EPREFIX@/usr/sbin/sendmail"
+#define _PATH_SHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/shadow"
+#define _PATH_SHELLS "@GENTOO_PORTAGE_EPREFIX@/etc/shells"
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
-#define _PATH_UTMP "/var/run/utmp"
-#define _PATH_VI "/usr/bin/vi"
+#define _PATH_UTMP "@GENTOO_PORTAGE_EPREFIX@/var/run/utmp"
+#define _PATH_VI "@GENTOO_PORTAGE_EPREFIX@/usr/bin/vi"
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
#define _PATH_DEV "/dev/"
#define _PATH_TMP "/tmp/"
-#define _PATH_VARDB "/var/db/"
-#define _PATH_VARRUN "/var/run/"
+#define _PATH_VARDB "@GENTOO_PORTAGE_EPREFIX@/var/db/"
+#define _PATH_VARRUN "@GENTOO_PORTAGE_EPREFIX@/var/run/"
#define _PATH_VARTMP "/var/tmp/"
#endif /* !_PATHS_H_ */
Index: glibc-2.19/sysdeps/posix/system.c
===================================================================
--- glibc-2.19.orig/sysdeps/posix/system.c
+++ glibc-2.19/sysdeps/posix/system.c
@@ -26,7 +26,7 @@
#include <sysdep-cancel.h>
-#define SHELL_PATH "/bin/sh" /* Path of the shell. */
+#define SHELL_PATH "@GENTOO_PORTAGE_EPREFIX@/bin/sh" /* Path of the shell. */
#define SHELL_NAME "sh" /* Name to give it. */
Index: glibc-2.19/libio/iopopen.c
===================================================================
--- glibc-2.19.orig/libio/iopopen.c
+++ glibc-2.19/libio/iopopen.c
@@ -222,7 +222,7 @@ _IO_new_proc_open (fp, command, mode)
_IO_close (fd);
}
- _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
+ _IO_execl ("@GENTOO_PORTAGE_EPREFIX@/bin/sh", "sh", "-c", command, (char *) 0);
_IO__exit (127);
}
_IO_close (child_end);
|
GitWeb