KDE Volume Partition Manager

Merge lp:~cjwatson/kvpm/ext4 into lp:~kubuntu-packagers/kubuntu-packaging/kvpm

  1. ext4
  2. Merge into kvpm
Proposed by Colin Watson
Status: Merged
Merged at revision: 21
Proposed branch: lp:~cjwatson/kvpm/ext4
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kvpm
Diff against target: None lines
To merge this branch: bzr merge lp:~cjwatson/kvpm/ext4
Reviewer Review Type Date Requested Status
Harald Sitter Approve
Guillaume Martres Pending
Review via email: mp+5270@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

I've uploaded this to Jaunty; see bug 335972.

Revision history for this message
Harald Sitter (apachelogger) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2008-12-12 12:20:14 +0000
+++ debian/changelog 2009-04-07 01:36:07 +0000
@@ -1,3 +1,9 @@
1kvpm (0.4.5b-0ubuntu5) jaunty; urgency=low
2
3 * Add ext4 support (LP: #335972).
4
5 -- Colin Watson <cjwatson@ubuntu.com> Tue, 07 Apr 2009 02:32:50 +0100
6
1kvpm (0.4.5b-0ubuntu4) jaunty; urgency=low7kvpm (0.4.5b-0ubuntu4) jaunty; urgency=low
28
3 * No change rebuild for libparted1.8-9 -> libparted1.8-10 transition9 * No change rebuild for libparted1.8-9 -> libparted1.8-10 transition
410
=== added file 'debian/patches/kubuntu_03_ext4.diff'
--- debian/patches/kubuntu_03_ext4.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_03_ext4.diff 2009-04-07 01:24:00 +0000
@@ -0,0 +1,194 @@
1--- kvpm/devicesizechartseg.cpp.orig
2+++ kvpm/devicesizechartseg.cpp
3@@ -54,6 +54,8 @@
4 colorset->setColor(QPalette::Window, Qt::blue);
5 else if(use == "ext3")
6 colorset->setColor(QPalette::Window, Qt::darkBlue);
7+ else if(use == "ext4")
8+ colorset->setColor(QPalette::Window, Qt::darkGreen);
9 else if(use == "reiserfs")
10 colorset->setColor(QPalette::Window, Qt::red);
11 else if(use == "vfat")
12--- kvpm/lvcreate.cpp.orig
13+++ kvpm/lvcreate.cpp
14@@ -59,7 +59,7 @@
15 QString mount_point;
16
17 QString fs = logicalVolume->getFilesystem();
18- QString warning_message = "Currently only the ext2, ext3 and reiserfs file systems are";
19+ QString warning_message = "Currently only the ext2, ext3, ext4 and reiserfs file systems are";
20 warning_message.append(" supported for file system extention. If this logical volume has ");
21 warning_message.append(" a filesystem or data, it will need to be extended separately!");
22
23@@ -125,7 +125,7 @@
24 return false;
25 }
26 }
27- else if( (fs != "ext2") && (fs != "ext3") && (fs != "reiserfs") ){
28+ else if( (fs != "ext2") && (fs != "ext3") && (fs != "ext4") && (fs != "reiserfs") ){
29 if(KMessageBox::warningContinueCancel(0, warning_message) != KMessageBox::Continue)
30 return false;
31 else{
32@@ -987,7 +987,7 @@
33 if( fs == "xfs" ){
34 args << "xfs_growfs" << mount_point;
35 }
36- else if( (fs == "ext2") || (fs == "ext3") ){
37+ else if( (fs == "ext2") || (fs == "ext3") || (fs == "ext4") ){
38 args << "resize2fs" << "-f"
39 << "/dev/" + m_vg->getName() + "/" + m_lv->getName();
40 }
41--- kvpm/lvreduce.cpp.orig
42+++ kvpm/lvreduce.cpp
43@@ -31,7 +31,7 @@
44 fs = logicalVolume->getFilesystem();
45 state = logicalVolume->getState();
46
47- QString warning_message = "Currently only the ext2 and ext3 file systems are supported";
48+ QString warning_message = "Currently only the ext2, ext3 and ext4 file systems are supported";
49 warning_message.append("for file system reduction. If this logical volume is reduced");
50 warning_message.append(" any data it contains will be lost!");
51
52@@ -75,7 +75,7 @@
53 KMessageBox::error(0, "The filesystem must be unmounted first");
54 return false;
55 }
56- else if( (fs != "ext2") && (fs != "ext3") ){
57+ else if( (fs != "ext2") && (fs != "ext3") && (fs != "ext4") ){
58 if(KMessageBox::warningContinueCancel(0, warning_message) != KMessageBox::Continue)
59 return false;
60 else{
61@@ -172,7 +172,8 @@
62 long long new_size = getSizeEditExtents( m_size_combo->currentIndex() );
63 new_size *= m_vg->getExtentSize();
64
65- if( (m_lv->getFilesystem() == "ext2") || (m_lv->getFilesystem() == "ext3") ){
66+ if( (m_lv->getFilesystem() == "ext2") || (m_lv->getFilesystem() == "ext3") ||
67+ (m_lv->getFilesystem() == "ext4") ){
68 fs_arguments << "resize2fs"
69 << "-f"
70 << "/dev/mapper/" + m_vg->getName() + "-" + m_lv->getName()
71--- kvpm/lvsizechartseg.cpp.orig
72+++ kvpm/lvsizechartseg.cpp
73@@ -53,6 +53,8 @@
74 colorset->setColor(QPalette::Window, Qt::blue);
75 else if(use == "ext3")
76 colorset->setColor(QPalette::Window, Qt::darkBlue);
77+ else if(use == "ext4")
78+ colorset->setColor(QPalette::Window, Qt::darkGreen);
79 else if(use == "reiserfs")
80 colorset->setColor(QPalette::Window, Qt::red);
81 else if(use == "reiser4")
82--- kvpm/mkfs.cpp.orig
83+++ kvpm/mkfs.cpp
84@@ -117,6 +117,7 @@
85 radio_box = new QGroupBox("Filesystem");
86 ext2 = new QRadioButton("Ext2", this);
87 ext3 = new QRadioButton("Ext3", this);
88+ ext4 = new QRadioButton("Ext4", this);
89 reiser = new QRadioButton("Reiser", this);
90 jfs = new QRadioButton("jfs", this);
91 xfs = new QRadioButton("xfs", this);
92@@ -124,8 +125,9 @@
93 vfat = new QRadioButton("ms-dos", this);
94 radio_left_layout->addWidget(ext2);
95 radio_left_layout->addWidget(ext3);
96+ radio_left_layout->addWidget(ext4);
97 radio_left_layout->addWidget(reiser);
98- radio_left_layout->addWidget(jfs);
99+ radio_right_layout->addWidget(jfs);
100 radio_right_layout->addWidget(xfs);
101 radio_right_layout->addWidget(vfat);
102 radio_right_layout->addWidget(swap);
103@@ -144,6 +146,8 @@
104 type = "ext2";
105 if(ext3->isChecked())
106 type = "ext3";
107+ if(ext4->isChecked())
108+ type = "ext4";
109 if(reiser->isChecked()){
110 mkfs_options << "-q";
111 type = "reiserfs";
112--- kvpm/mkfs.h.orig
113+++ kvpm/mkfs.h
114@@ -30,7 +30,7 @@
115 class MkfsDialog : public KDialog
116 {
117 QGroupBox *radio_box;
118- QRadioButton *ext2, *ext3, *reiser, *jfs, *xfs, *vfat, *swap;
119+ QRadioButton *ext2, *ext3, *ext4, *reiser, *jfs, *xfs, *vfat, *swap;
120 QString type;
121 QString path;
122
123--- kvpm/mount.cpp.orig
124+++ kvpm/mount.cpp
125@@ -75,6 +75,7 @@
126
127 ext2_button = new QRadioButton("Ext2", this);
128 ext3_button = new QRadioButton("Ext3", this);
129+ ext4_button = new QRadioButton("Ext4", this);
130 reiserfs3_button = new QRadioButton("Reiserfs Ver. 3", this);
131 reiserfs4_button = new QRadioButton("Reiserfs Ver. 4", this);
132 xfs_button = new QRadioButton("Xfs", this);
133@@ -90,6 +91,8 @@
134 ext2_button->setChecked(true);
135 else if( m_filesystem_type == "ext3" )
136 ext3_button->setChecked(true);
137+ else if( m_filesystem_type == "ext4" )
138+ ext4_button->setChecked(true);
139 else if( m_filesystem_type == "reiserfs" )
140 reiserfs3_button->setChecked(true);
141 else if( m_filesystem_type == "reiser4" )
142@@ -116,6 +119,7 @@
143
144 layout_left->addWidget(ext2_button);
145 layout_left->addWidget(ext3_button);
146+ layout_left->addWidget(ext4_button);
147 layout_left->addWidget(vfat_button);
148 layout_center->addWidget(reiserfs3_button);
149 layout_center->addWidget(reiserfs4_button);
150@@ -243,6 +247,9 @@
151 connect(ext3_button, SIGNAL( toggled(bool) ),
152 this, SLOT( toggleAdditionalOptions(bool)));
153
154+ connect(ext4_button, SIGNAL( toggled(bool) ),
155+ this, SLOT( toggleAdditionalOptions(bool)));
156+
157 connect(reiserfs3_button, SIGNAL( toggled(bool) ),
158 this, SLOT( toggleAdditionalOptions(bool)));
159
160@@ -323,6 +330,8 @@
161 m_filesystem_type = "ext2";
162 else if( ext3_button->isChecked() )
163 m_filesystem_type = "ext3";
164+ else if( ext4_button->isChecked() )
165+ m_filesystem_type = "ext4";
166 else if( reiserfs3_button->isChecked() )
167 m_filesystem_type = "reiserfs";
168 else if( reiserfs4_button->isChecked() )
169@@ -447,12 +456,13 @@
170
171 void MountDialog::toggleAdditionalOptions(bool)
172 {
173- if( ext3_button->isChecked() )
174+ if( ext3_button->isChecked() || ext4_button->isChecked() )
175 m_filesystem_journal_box->setEnabled(true);
176 else
177 m_filesystem_journal_box->setEnabled(false);
178
179 if( ext2_button->isChecked() || ext3_button->isChecked() ||
180+ ext4_button->isChecked() ||
181 reiserfs3_button->isChecked() || reiserfs4_button->isChecked() ){
182
183 acl_check->setEnabled(true);
184--- kvpm/mount.h.orig
185+++ kvpm/mount.h
186@@ -38,7 +38,7 @@
187 m_device_to_mount, // The complete device path
188 m_filesystem_type; // ext3, reiserfs, vfat etc.
189
190- QRadioButton *ext2_button, *ext3_button, *reiserfs3_button, *reiserfs4_button,
191+ QRadioButton *ext2_button, *ext3_button, *ext4_button, *reiserfs3_button, *reiserfs4_button,
192 *xfs_button, *jfs_button, *vfat_button, *specify_button,
193 *udf_button, *iso9660_button, *hfs_button,
194 *atime_button, *noatime_button, *nodiratime_button, *relatime_button,
0195
=== modified file 'debian/patches/series'
--- debian/patches/series 2008-07-21 14:30:44 +0000
+++ debian/patches/series 2009-04-07 01:24:00 +0000
@@ -1,2 +1,3 @@
1kubuntu_01_add_install_target.diff1kubuntu_01_add_install_target.diff
2kubuntu_02_missing_include.diff2kubuntu_02_missing_include.diff
3kubuntu_03_ext4.diff

Subscribers

People subscribed via source and target branches