commit 67166d5062247fb597151c5c1aeb49801f0c8f68
Author: Maia Kozheva <[email protected]>
Date: Thu Aug 26 15:54:59 2010 +0700
Change mountpoint to use the modern /media directory; patch from Debian by
Nico Golde <[email protected]>
README | 42 +++++++++++++++++++-------------------
libgtkpod/prefs.c | 2 +-
scripts/sync-abook.sh | 2 +-
scripts/sync-evocalendar.sh | 2 +-
scripts/sync-evolution.sh | 2 +-
scripts/sync-kaddressbook.sh | 2 +-
scripts/sync-korganizer.sh | 2 +-
scripts/sync-ldif.sh | 2 +-
scripts/sync-thunderbird-nano.sh | 2 +-
scripts/sync-thunderbird.sh | 2 +-
scripts/sync-webcalendar.sh | 2 +-
11 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/README b/README
index 5160697..9206be7 100644
--- a/README
+++ b/README
@@ -53,7 +53,7 @@ for details.
1) If your iPod is not mounted automatically when connecting it to
your computer follow steps 1-7 in the "Connecting your iPod to a
Linux box" (basically you need to get the iPod partition mounted to
- /mnt/ipod). In most cases this should not be necessary any more
+ /media/ipod). In most cases this should not be necessary any more
these days.
2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will
@@ -737,13 +737,13 @@ ipod -fstype=vfat :/dev/ipod
(Obviously you need to change the filesystem type from 'vfat' to
'hfsplus' when you use an HFS formatted iPod.)
- Then simply add a link from /mnt/ipod:
+ Then simply add a link from /media/ipod:
- ln -s /var/autofs/removable/ipod /mnt/ipod
+ ln -s /var/autofs/removable/ipod /media/ipod
Now your system is configured to mount the iPod every time you access
-/mnt/ipod and to unmount it again after two seconds of inactivity. You
+/media/ipod and to unmount it again after two seconds of inactivity. You
won't have to worry about doing mounting/unmouting yourself any more.
@@ -788,19 +788,19 @@ At least for the new 4Gs and iPod minis you should
_disable_
* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)
-3) Create /mnt/ipod:
+3) Create /media/ipod:
- mkdir /mnt/ipod
+ mkdir /media/ipod
4) Add a line to /etc/fstab. You should edit uid to match your user
id. Also, /dev/sda2 may not be appropriate, if you have other scsi
devices.
-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,errors=remount 0 0
+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,errors=remount 0 0
(For HFS this line should read
-/dev/sda /mnt/ipod hfsplus rw,user,noauto,exec 0 0
+/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0
please note that it's just '/dev/sda')
@@ -808,7 +808,7 @@ At least for the new 4Gs and iPod minis you should _disable_
NOTE: Some users have had problems with newer versions of mount (newer than
mount-2.11h) The following fstab entry might work better for you.
-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0
+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0
5) Install the hotplug utilities
(http://linux-hotplug.sourceforge.net/, debian package: 'hotplug')
@@ -857,13 +857,13 @@ Jun 15 17:13:58 hatarakibachi kernel: scsi singledevice 0
0 1 0
7) Mount the iPod hard drive
- mount /mnt/ipod
+ mount /media/ipod
8) do whatever you need to do (e.g. start gtkpod, see below)
9) Unmount the iPod:
- umount /mnt/ipod
+ umount /media/ipod
10) Unload the module sbp2 (as most likely as root):
@@ -912,19 +912,19 @@ At least for the new 4Gs and iPod minis you should
_disable_
* -> Codepage 437 (CONFIG_NLS_CODEPAGE_437)
* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)
-3) Create /mnt/ipod:
+3) Create /media/ipod:
- mkdir /mnt/ipod
+ mkdir /media/ipod
4) Add a line to /etc/fstab. You should edit uid to match your user
id. Also, /dev/sda2 may not be appropriate, if you have other scsi
devices.
-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime 0 0
+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime 0 0
(For HFS this line should read
-/dev/sda /mnt/ipod hfsplus rw,user,noauto,exec 0 0
+/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0
please note that it's just '/dev/sda')
@@ -932,7 +932,7 @@ At least for the new 4Gs and iPod minis you should _disable_
NOTE: Some users have had problems with newer versions of mount (newer than
mount-2.11h) The following fstab entry might work better for you.
-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0
+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0
NOTE: You can add ",umask=0" to the options to make the iPod
readable/writable for all users.
@@ -972,13 +972,13 @@ Nov 28 21:58:39 hatarakibachi kernel: sda: sda1 sda2
7) Mount the iPod hard drive
- mount /mnt/ipod
+ mount /media/ipod
8) do whatever you need to do (e.g. start gtkpod, see below)
9) Unmount the iPod:
- umount /mnt/ipod
+ umount /media/ipod
10) Unload the module sbp2 (as most likely as root):
@@ -1012,7 +1012,7 @@ The trick to it is that you have to
- since the iPod's hdd was already spun up, the SCSI subsystem now
recognizes it and mounts it as /dev/sda
-- You can then mount /dev/sda2 to /mnt/ipod as normal."
+- You can then mount /dev/sda2 to /media/ipod as normal."
On the other hand: with my 4G iPod under 2.6.9 and 2.6.10 I never had
any problem whatsoever getting the iPod to work. With IEEE it was
@@ -1068,10 +1068,10 @@ enough rights to.
/**********/
Add a line similar to the below to your /etc/fstab, this will enable users
to mount the ipod with read/write capabilities. Example line assumes your
-ipod mount point is /mnt/ipod and your ipod is detected as /dev/sda
+ipod mount point is /media/ipod and your ipod is detected as /dev/sda
------------------------------- Begin Here ---------------------------------
-/dev/sda2 /mnt/ipod vfat rw,user,noauto 0 0
+/dev/sda2 /media/ipod vfat rw,user,noauto 0 0
------------------------------- End Here -----------------------------------
diff --git a/libgtkpod/prefs.c b/libgtkpod/prefs.c
index fd6c573..0e10901 100644
--- a/libgtkpod/prefs.c
+++ b/libgtkpod/prefs.c
@@ -171,7 +171,7 @@ static void set_default_preferences() {
prefs_set_int("delete_file", TRUE);
prefs_set_int("delete_local_file", TRUE);
prefs_set_int("delete_database", TRUE);
- prefs_set_string("initial_mountpoint", "/mnt/ipod");
+ prefs_set_string("initial_mountpoint", "/media/ipod");
prefs_set_string("path_play_now", "xmms %s");
prefs_set_string("path_play_enqueue", "xmms -e %s");
prefs_set_string("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");
diff --git a/scripts/sync-abook.sh b/scripts/sync-abook.sh
index 1fc22c3..652754f 100755
--- a/scripts/sync-abook.sh
+++ b/scripts/sync-abook.sh
@@ -9,7 +9,7 @@
#
# with the following defaults:
-IPOD_MOUNT='/mnt/ipod' # mount point of ipod
+IPOD_MOUNT='/media/ipod' # mount point of ipod
DATAFILE='~/.abook/addressbook' # the abook db
ENCODING_FROM=UTF-8 # encoding used by abook
ENCODING=ISO-8859-15 # encoding used by ipod
diff --git a/scripts/sync-evocalendar.sh b/scripts/sync-evocalendar.sh
index e73371c..4380cc0 100755
--- a/scripts/sync-evocalendar.sh
+++ b/scripts/sync-evocalendar.sh
@@ -10,7 +10,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
#the path to a script that will be passed the ical information from STDIN and
filter, if needed
#FILTER_SCRIPT=
diff --git a/scripts/sync-evolution.sh b/scripts/sync-evolution.sh
index f1f81f7..488f7b6 100755
--- a/scripts/sync-evolution.sh
+++ b/scripts/sync-evolution.sh
@@ -13,7 +13,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
ENCODING=ISO-8859-15 # encoding used by ipod
# try to find the path to evolution-addressbook-export
diff --git a/scripts/sync-kaddressbook.sh b/scripts/sync-kaddressbook.sh
index e9f4d74..6262b54 100755
--- a/scripts/sync-kaddressbook.sh
+++ b/scripts/sync-kaddressbook.sh
@@ -9,7 +9,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
DATAFILE=~/.kde/share/apps/kabc/std.vcf # vcard file
ENCODING=ISO-8859-15 # encoding used by ipod
diff --git a/scripts/sync-korganizer.sh b/scripts/sync-korganizer.sh
index 0e880cb..e904981 100755
--- a/scripts/sync-korganizer.sh
+++ b/scripts/sync-korganizer.sh
@@ -9,7 +9,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file
ENCODING=ISO-8859-15 # encoding used by ipod
diff --git a/scripts/sync-ldif.sh b/scripts/sync-ldif.sh
index a58faac..675dcd3 100755
--- a/scripts/sync-ldif.sh
+++ b/scripts/sync-ldif.sh
@@ -15,7 +15,7 @@
# differently...This is still Chinese for me!! :)
export LDIFAMILYNAME=contactIPOD # Filenames will look like
$LDIFAMILYNAMEXX.vcf, X=[0-9]
-export IPOD_MOUNT=/mnt/ipod # Mount point of the ipod
+export IPOD_MOUNT=/media/ipod # Mount point of the ipod
declare LDIFILE=addressbook.ldif # default filename 'addressbook.ldif'
declare ENCODING=ISO-8859-15 # To try others encodings : 'iconv
--list'
declare DELETE="NO" # To delete old .vcf files by default?
'NO'!!
diff --git a/scripts/sync-thunderbird-nano.sh b/scripts/sync-thunderbird-nano.sh
index 714fb28..ebd559e 100755
--- a/scripts/sync-thunderbird-nano.sh
+++ b/scripts/sync-thunderbird-nano.sh
@@ -25,7 +25,7 @@
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
ENCODING=ISO-8859-15 # encoding used by ipod
NAME=thunderbird # default file export name
FILE_FLAG='' # flag used to determine end of file
diff --git a/scripts/sync-thunderbird.sh b/scripts/sync-thunderbird.sh
index 25ea91c..b62db88 100755
--- a/scripts/sync-thunderbird.sh
+++ b/scripts/sync-thunderbird.sh
@@ -18,7 +18,7 @@
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
ENCODING=ISO-8859-15 # encoding used by ipod
NAME=thunderbird # default file export name
diff --git a/scripts/sync-webcalendar.sh b/scripts/sync-webcalendar.sh
index 7d85635..e8ba5f0 100755
--- a/scripts/sync-webcalendar.sh
+++ b/scripts/sync-webcalendar.sh
@@ -9,7 +9,7 @@
# with the following defaults:
# mount point of ipod
-IPOD_MOUNT='/mnt/ipod'
+IPOD_MOUNT='/media/ipod'
# uri for webcalendar (example)
DATAFILE='https://somewhere.local/calendar.ics'
# calendar name
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
