linuxmint/timeshift
1
1
Fork 0
mirror of https://github.com/linuxmint/timeshift.git synced 2024-09-11 17:07:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue while mounting backup device

Browse Source
This commit is contained in:
Tony George 2013-11-08 19:36:20 +05:30
parent 715138faf2
commit c0087dca19
4 changed files with 65 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.vala
View File

@ -265,7 +265,7 @@ public class Main : GLib.Object{
partition_list = new Gee.ArrayList<PartitionInfo>();
add_default_exclude_entries();
add_app_exclude_entries();
//add_app_exclude_entries();
//check current linux distribution -----------------

9
src/RestoreWindow.vala
View File

@ -232,7 +232,8 @@ public class RestoreWindow : Gtk.Dialog{
CellRendererText cell_device_grub = new CellRendererText();
cmb_boot_device.pack_start(cell_device_grub, false );
cmb_boot_device.set_cell_data_func (cell_device_grub, cell_device_grub_render);
/*
//Exclude Apps tab ---------------------------------------------
//lbl_apps
@ -287,7 +288,9 @@ public class RestoreWindow : Gtk.Dialog{
CellRendererText cell_app_text = new CellRendererText ();
col_app.pack_start (cell_app_text, false);
col_app.set_cell_data_func (cell_app_text, cell_app_text_render);
*/
//Advanced tab ---------------------------------------------
//lbl_exclude
@ -490,7 +493,7 @@ public class RestoreWindow : Gtk.Dialog{
refresh_tv_partitions();
refresh_cmb_boot_device();
refresh_tv_exclude();
refresh_tv_apps();
//refresh_tv_apps();
}

83
src/Utility.vala
View File

@ -342,6 +342,7 @@ namespace TeeJee.DiskPartition{
public string used_percent = "";
public string dist_info = "";
public Gee.ArrayList<string> mount_point_list;
public string mount_options = "";
public PartitionInfo(){
mount_point_list = new Gee.ArrayList<string>();
@ -562,34 +563,61 @@ namespace TeeJee.DiskPartition{
return list;
}
public Gee.ArrayList<PartitionInfo?> get_mounted_partitions_using_mount(bool exclude_unknown = true){
public Gee.ArrayList<PartitionInfo?> get_mounted_partitions_using_mtab(bool exclude_unknown = true){
/* Returns list of mounted partitions using 'mount' command
Populates device, type and mount_point_list */
var list = new Gee.ArrayList<PartitionInfo?>();
string std_out = "";
string std_err = "";
string mtab_path = "/etc/mtab";
string mtab_lines = "";;
int exit_code = execute_command_script_sync("mount", out std_out, out std_err);
if (exit_code != 0){
log_error ("Failed to get list of partitions");
return list; //return empty list
File f;
//find mtab file -----------
mtab_path = "/etc/mtab";
f = File.new_for_path(mtab_path);
if(!f.query_exists()){
mtab_path = "/proc/mounts";
f = File.new_for_path(mtab_path);
if(!f.query_exists()){
mtab_path = "/proc/self/mounts";
f = File.new_for_path(mtab_path);
if(!f.query_exists()){
return list; //empty list
}
}
}
//read -----------
mtab_lines = read_file(mtab_path);
/*
sample output
sample mtab
-----------------
/dev/sda3 on / type ext4 (rw,errors=remount-ro)
proc on /proc type proc (rw,noexec,nosuid,nodev)
sysfs on /sys type sysfs (rw,noexec,nosuid,nodev)
none on /sys/fs/cgroup type tmpfs (rw)
none on /sys/fs/fuse/connections type fusectl (rw)
/dev/sda3 / ext4 rw,errors=remount-ro 0 0
proc /proc proc rw,noexec,nosuid,nodev 0 0
sysfs /sys sysfs rw,noexec,nosuid,nodev 0 0
none /sys/fs/cgroup tmpfs rw 0 0
none /sys/fs/fuse/connections fusectl rw 0 0
none /sys/kernel/debug debugfs rw 0 0
none /sys/kernel/security securityfs rw 0 0
udev /dev devtmpfs rw,mode=0755 0 0
device - the device or remote filesystem that is mounted.
mountpoint - the place in the filesystem the device was mounted.
filesystemtype - the type of filesystem mounted.
options - the mount options for the filesystem
dump - used by dump to decide if the filesystem needs dumping.
fsckorder - used by fsck to detrmine the fsck pass to use.
*/
foreach(string line in std_out.split("\n")){
//parse ------------
foreach(string line in mtab_lines.split("\n")){
if (line.strip().length == 0) { continue; }
@ -601,31 +629,28 @@ namespace TeeJee.DiskPartition{
foreach(string val in line.split(" ")){
if (val.strip().length == 0){ continue; }
switch(k++){
case 1:
case 1: //device
pi.device = val.strip();
break;
case 2:
//'on' ignore
break;
case 3:
case 2: //mountpoint
string mount_point = val.strip();
if (!pi.mount_point_list.contains(mount_point)){
pi.mount_point_list.add(mount_point);
}
break;
case 4:
//'type' ignore
break;
case 5:
case 3: //filesystemtype
pi.type = val.strip();
break;
case 4: //options
pi.mount_options = val.strip();
break;
default:
//ignore
break;
}
}
//exclude unknown devices
//exclude unknown device names
if (exclude_unknown){
if (!(pi.device.has_prefix("/dev/sd") || pi.device.has_prefix("/dev/hd") || pi.device.has_prefix("/dev/mapper/"))) {
continue;
@ -762,7 +787,7 @@ namespace TeeJee.DiskPartition{
// add more devices ----------
var list_mount = get_mounted_partitions_using_mount(exclude_unknown);
var list_mount = get_mounted_partitions_using_mtab(exclude_unknown);
foreach (PartitionInfo pm in list_mount){
bool found = false;
@ -877,7 +902,7 @@ namespace TeeJee.DiskPartition{
//check if mounted
bool mounted = false;
foreach(PartitionInfo info in get_mounted_partitions_using_df()){
foreach(PartitionInfo info in get_mounted_partitions_using_mtab()){
if (info.mount_point_list.contains(mount_point) && info.device == device){
//device is already mounted at mount point
@ -936,7 +961,7 @@ namespace TeeJee.DiskPartition{
try{
//check if mounted and unmount
foreach(PartitionInfo info in get_mounted_partitions_using_df()){
foreach(PartitionInfo info in get_mounted_partitions_using_mtab()){
if (info.mount_point_list.contains(mount_point)){
log_msg(_("Unmounting device") + " '%s' ".printf(info.device) + _("from") + " '%s'".printf(mount_point));

8
timeshift.geany
View File

@ -17,12 +17,12 @@ long_line_behaviour=1
long_line_column=80
[files]
current_page=1
FILE_NAME_0=53670;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FMain.vala;0;4
FILE_NAME_1=37513;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4
current_page=4
FILE_NAME_0=55893;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FMain.vala;0;4
FILE_NAME_1=38062;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4
FILE_NAME_2=14509;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_3=16588;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FRestoreWindow.vala;0;4
FILE_NAME_4=28586;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FUtility.vala;0;4
FILE_NAME_4=22094;Vala;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2FUtility.vala;0;4
FILE_NAME_5=708;Make;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fsrc%2Fmakefile;0;4
FILE_NAME_6=813;Conf;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fdebian%2Fcontrol;0;4
FILE_NAME_7=221;None;0;16;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Ftimeshift%2Fdebian%2Fchangelog;0;4