1
Index: oss4-4.2-build2004/cmd/ossdevlinks/ossdevlinks.c
2
===================================================================
3
--- oss4-4.2-build2004.orig/cmd/ossdevlinks/ossdevlinks.c 2011-06-14 11:33:24.000000000 -0500
4
+++ oss4-4.2-build2004/cmd/ossdevlinks/ossdevlinks.c 2011-06-14 11:33:24.000000000 -0500
7
#define DEFAULT_OSSLIBDIR "/etc/oss"
9
-#define DEFAULT_OSSLIBDIR "/usr/lib/oss"
10
+#define DEFAULT_OSSLIBDIR "/var/lib/oss4"
15
if (l > 0 && tmp[l - 1] == '\n')
18
- if (strncmp (tmp, "OSSLIBDIR=", 10) == 0)
19
+ if (strncmp (tmp, "OSSVARDIR=", 10) == 0)
21
l = snprintf (name, sizeof (name), "%s", &tmp[10]);
22
if ((l >= OSSLIBDIRLEN) || (l < 0))
24
char lfile[PATH_MAX+20], * osslibdir;
26
osslibdir = get_mapname ();
27
- snprintf (lfile, sizeof (lfile), "%s/%s", osslibdir, "etc/legacy_devices");
28
+ snprintf (lfile, sizeof (lfile), "%s/%s", osslibdir, "legacy_devices");
29
if ((f = fopen (lfile, "w")) == NULL)
32
Index: oss4-4.2-build2004/cmd/ossdevlinks/ossdevlinks.man
33
===================================================================
34
--- oss4-4.2-build2004.orig/cmd/ossdevlinks/ossdevlinks.man 2011-06-14 11:33:24.000000000 -0500
35
+++ oss4-4.2-build2004/cmd/ossdevlinks/ossdevlinks.man 2011-06-14 11:33:24.000000000 -0500
40
-/usr/lib/oss/etc/legacy_devices
41
+/var/lib/oss4/legacy_devices
45
Index: oss4-4.2-build2004/cmd/savemixer/savemixer.c
46
===================================================================
47
--- oss4-4.2-build2004.orig/cmd/savemixer/savemixer.c 2011-06-14 11:33:24.000000000 -0500
48
+++ oss4-4.2-build2004/cmd/savemixer/savemixer.c 2011-06-14 11:33:24.000000000 -0500
53
- char tmp[ETCDIRLEN+11]; /* Adding 'OSSLIBDIR=' */
54
- static char name[ETCDIRLEN+15]; /* Adding '/etc/mixer.save' */
55
+ char tmp[ETCDIRLEN+11]; /* Adding 'OSSVARDIR=' */
56
+ static char name[ETCDIRLEN+10]; /* Adding 'mixer.save' */
59
- if (stat ("/etc/oss", &st) != -1) /* Use /etc/oss/mixer.save */
60
+ if (stat ("/var/lib/oss4", &st) != -1) /* Use /var/lib/oss4/mixer.save */
62
- strcpy (name, "/etc/oss/mixer.save");
63
- strcpy (ossetcdir, "/etc/oss");
64
+ strcpy (name, "/var/lib/oss4/mixer.save");
65
+ strcpy (ossetcdir, "/var/lib/oss4");
70
if (l > 0 && tmp[l - 1] == '\n')
73
- if (strncmp (tmp, "OSSLIBDIR=", 10) == 0)
74
+ if (strncmp (tmp, "OSSVARDIR=", 10) == 0)
76
- l = snprintf (name, sizeof (name), "%s/etc/mixer.save", &tmp[10]);
77
+ l = snprintf (name, sizeof (name), "%s/mixer.save", &tmp[10]);
78
if ((l >= sizeof (name)) || (l < 0))
80
fprintf (stderr, "String in /etc/oss.conf is too long!\n");
83
- snprintf (ossetcdir, sizeof (ossetcdir), "%s/etc", &tmp[10]);
84
+ snprintf (ossetcdir, sizeof (ossetcdir), "%s", &tmp[10]);
85
if ((l >= sizeof (ossetcdir)) || (l < 0))
87
fprintf (stderr, "String in /etc/oss.conf is too long!\n");
92
- fprintf (stderr, "Error: OSSLIBDIR not set in /etc/oss.conf\n");
93
+ fprintf (stderr, "Error: OSSVARDIR not set in /etc/oss.conf\n");
96
snprintf (name, sizeof (name), "%s/mixer.save", ossetcdir);
97
Index: oss4-4.2-build2004/cmd/savemixer/savemixer.man
98
===================================================================
99
--- oss4-4.2-build2004.orig/cmd/savemixer/savemixer.man 2011-06-14 11:33:23.000000000 -0500
100
+++ oss4-4.2-build2004/cmd/savemixer/savemixer.man 2011-06-14 11:33:24.000000000 -0500
102
settings back into the mixer.
104
Running this program without any parameters will save the current mixer
105
-settings into /etc/oss/mixer.save or $OSSLIBDIR/etc/mixer.save file.
106
-OSSLIBDIR is decided by reading /etc/oss.conf, and defaults to /usr/lib/oss.
107
+settings into /var/lib/oss4/mixer.save or $OSSVARDIR/mixer.save file.
108
+OSSVARDIR is decided by reading /etc/oss.conf, and defaults to /var/lib/oss4.
111
By default the soundoff command will automatically run savemixer to save
116
-/usr/lib/oss/etc/mixer.save
117
-/usr/lib/oss/etc/dspdevs.map
118
-/usr/lib/oss/etc/applist.conf
119
+/var/lib/oss4/mixer.save
120
+/var/lib/oss4/dspdevs.map
121
+/var/lib/oss4/applist.conf