projects
/
carnet-upgrade.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6482814
)
Rename kernel-2.6-cn to kernel-cn.
author
Valentin Vidic
<Valentin.Vidic@CARNet.hr>
Mon, 28 Oct 2013 08:04:16 +0000
(09:04 +0100)
committer
Valentin Vidic
<Valentin.Vidic@CARNet.hr>
Mon, 28 Oct 2013 08:04:16 +0000
(09:04 +0100)
doc/carnet-upgrade-src.sgml
patch
|
blob
|
history
src/actions/main.queue
patch
|
blob
|
history
src/actions/post_upgrade.queue
patch
|
blob
|
history
src/data.sh
patch
|
blob
|
history
src/functions.sh
patch
|
blob
|
history
diff --git
a/doc/carnet-upgrade-src.sgml
b/doc/carnet-upgrade-src.sgml
index
4f7aaaa
..
4139a57
100644
(file)
--- a/
doc/carnet-upgrade-src.sgml
+++ b/
doc/carnet-upgrade-src.sgml
@@
-556,7
+556,7
@@
CN: run_actions (main) started...
<p>
Ukoliko imate malu <file>/</file> particiju moguće je da instalacija
<p>
Ukoliko imate malu <file>/</file> particiju moguće je da instalacija
- kernel paketa neće uspjeti. Paket <package>kernel-2.6-cn</package>
+ kernel paketa neće uspjeti. Paket <package>kernel-cn</package>
zauzima oko 100 MB. Stare inačice kernela se ne brišu iz
<file>/boot</file> direktorija što nakon nekoliko iteracija može
dovesti do zapunjenja particije. Rješenje je brisanje starih
zauzima oko 100 MB. Stare inačice kernela se ne brišu iz
<file>/boot</file> direktorija što nakon nekoliko iteracija može
dovesti do zapunjenja particije. Rješenje je brisanje starih
diff --git
a/src/actions/main.queue
b/src/actions/main.queue
index
72319c2
..
21b2e58
100644
(file)
--- a/
src/actions/main.queue
+++ b/
src/actions/main.queue
@@
-48,7
+48,7
@@
true remove_orphaned # ocisti stare libove nakon sto su cn paketi nadogradje
true add_group_proc # za oidentd
true enable_monit
true clean_old_kernels
true add_group_proc # za oidentd
true enable_monit
true clean_old_kernels
-pkg kernel-2.6-cn dpkg-reconfigure kernel-2.6-cn
+pkg kernel-cn dpkg-reconfigure kernel-cn
true clean_initd_packages
true dpkg-reconfigure sysv-rc
# ovo bi trebalo biti predzadnje na popisu
true clean_initd_packages
true dpkg-reconfigure sysv-rc
# ovo bi trebalo biti predzadnje na popisu
diff --git
a/src/actions/post_upgrade.queue
b/src/actions/post_upgrade.queue
index
0bda10b
..
1a0ed5e
100644
(file)
--- a/
src/actions/post_upgrade.queue
+++ b/
src/actions/post_upgrade.queue
@@
-8,7
+8,7
@@
true debconf_priority reset
true add_group_proc # + restart oidentd ako treba
pkg xserver-xorg remove_x
true install_new
true add_group_proc # + restart oidentd ako treba
pkg xserver-xorg remove_x
true install_new
-pkg kernel-2.6-cn dpkg-reconfigure kernel-2.6-cn
+pkg kernel-cn dpkg-reconfigure kernel-cn
# ovo bi trebalo biti predzadnje na popisu
# - izvrsi sve uvjetne post_upgrade akcije
true run_post_upgrade
# ovo bi trebalo biti predzadnje na popisu
# - izvrsi sve uvjetne post_upgrade akcije
true run_post_upgrade
diff --git
a/src/data.sh
b/src/data.sh
index
6c703c9
..
a767f56
100644
(file)
--- a/
src/data.sh
+++ b/
src/data.sh
@@
-55,7
+55,7
@@
clamav-cn clamav-daemon
dovecot-cn
freeradius-aai freeradius
isc-dhcp-client
dovecot-cn
freeradius-aai freeradius
isc-dhcp-client
-kernel-2.6-cn
+kernel-2.6-cn kernel-cn
monit-cn
munin-cn
mysql-cn mysql-client mysql-server
monit-cn
munin-cn
mysql-cn mysql-client mysql-server
diff --git
a/src/functions.sh
b/src/functions.sh
index
2fbcacd
..
ce1aef8
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-1043,12
+1043,12
@@
check_archives_space() {
fi
}
fi
}
-# calculate the list of linux-image packages from kernel-2.6-cn dependencies
+# calculate the list of linux-image packages from kernel-cn dependencies
get_cn_kernels() {
local cn_kernels linux_images metapkg pkg
cn_kernels=
get_cn_kernels() {
local cn_kernels linux_images metapkg pkg
cn_kernels=
- linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \
+ linux_images=$(apt-cache show kernel-cn | grep ^Depends: \
| grep -o 'linux-image[^, ]*')
for metapkg in $linux_images; do
pkg=$(apt-cache show $metapkg | grep ^Depends: \
| grep -o 'linux-image[^, ]*')
for metapkg in $linux_images; do
pkg=$(apt-cache show $metapkg | grep ^Depends: \
@@
-1080,10
+1080,10
@@
check_kernel_space() {
log "Kernel package: $pkg"
log "Kernel size: ${kernel_size}MB"
log "Kernel package: $pkg"
log "Kernel size: ${kernel_size}MB"
- if LC_ALL=C apt-get -s install kernel-2.6-cn 2>/dev/null \
- | grep -q '^kernel-2.6-cn is already the newest version.$'
+ if LC_ALL=C apt-get -s install kernel-cn 2>/dev/null \
+ | grep -q '^kernel-cn is already the newest version.$'
then
then
- log "Not checking free space in /: kernel-2.6-cn already installed"
+ log "Not checking free space in /: kernel-cn already installed"
return
fi
return
fi